diff --git a/src/tests/test-secret-agent.py b/src/tests/test-secret-agent.py
index a6ae6fd77..6b9e676b3 100755
--- a/src/tests/test-secret-agent.py
+++ b/src/tests/test-secret-agent.py
@@ -59,9 +59,15 @@ def main():
     mainloop = gobject.MainLoop()
 
     gobject.idle_add(register, proxy)
-    gobject.timeout_add_seconds(10, unregister, proxy, mainloop)
     print "Running test secret agent" 
-    mainloop.run()
+
+    try:
+        mainloop.run()
+    except KeyboardInterrupt, e:
+        pass
+
+    print "Unregistering..."
+    unregister(proxy, mainloop);
 
 if __name__ == '__main__':
     main()