diff --git a/bluez/simple-agent b/bluez/simple-agent
index edcb97282664ab3aa4321f5e123b1b9ae76e023c..dbb0b0d07ef2f6fdbfbcef59fffb7e6a45910804 100755
--- a/bluez/simple-agent
+++ b/bluez/simple-agent
@@ -33,6 +33,7 @@ import os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir))
 from apertis_tests_lib.bluez import AskAgent
 from apertis_tests_lib.bluez import build_device_path
+from apertis_tests_lib.bluez import adapters_make_pairable
 
 
 if __name__ == '__main__':
@@ -68,7 +69,8 @@ if __name__ == '__main__':
     else:
         path = list(adapters.keys())[0]
 
-    adapter = dbus.Interface(bus.get_object("org.bluez", path),
+    adapter_obj = bus.get_object("org.bluez", path)
+    adapter = dbus.Interface(adapter_obj,
                              "org.bluez.Adapter1")
 
     agent = AskAgent(bus, '/test/agent', mainloop)
@@ -86,7 +88,9 @@ if __name__ == '__main__':
                     error_handler=pair_error,
                     timeout=60000)
     else:
+        adapters_make_pairable([ adapter_obj ])
         agent_manager_iface.RegisterAgent('/test/agent', options.capability)
+        agent_manager_iface.RequestDefaultAgent('/test/agent')
         print("Agent registered")
 
     mainloop.run()