diff --git a/src/pEpmodule.cc b/src/pEpmodule.cc
index 1a01338..d3ed6a6 100644
--- a/src/pEpmodule.cc
+++ b/src/pEpmodule.cc
@@ -480,7 +480,7 @@ BOOST_PYTHON_MODULE(pEp)
         .value("SYNC_NOTIFY_TIMEOUT"               , SYNC_NOTIFY_TIMEOUT)
         .value("SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED" , SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED)
         .value("SYNC_NOTIFY_ACCEPTED_GROUP_CREATED", SYNC_NOTIFY_ACCEPTED_GROUP_CREATED)
-        .value("SYNC_NOTIFY_OVERTAKEN"             , SYNC_NOTIFY_OVERTAKEN)
+        .value("SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED", SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED)
         .value("SYNC_NOTIFY_SOLE"                  , SYNC_NOTIFY_SOLE)
         .value("SYNC_NOTIFY_IN_GROUP"              , SYNC_NOTIFY_IN_GROUP);
 
diff --git a/test/sync_handshake.py b/test/sync_handshake.py
index 2d60cdb..67d28f9 100644
--- a/test/sync_handshake.py
+++ b/test/sync_handshake.py
@@ -48,10 +48,11 @@ SYNC_HANDSHAKE_ACCEPTED = 0
 SYNC_HANDSHAKE_REJECTED = 1
 
 the_end = False
-end_on = (
+end_on = [
         pEp.sync_handshake_signal.SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED,
-        pEp.sync_handshake_signal.SYNC_NOTIFY_ACCEPTED_GROUP_CREATED
-    )
+        pEp.sync_handshake_signal.SYNC_NOTIFY_ACCEPTED_GROUP_CREATED,
+        pEp.sync_handshake_signal.SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED,
+    ]
 
 
 def print_msg(p):
@@ -109,6 +110,10 @@ class UserInterface(pEp.UserInterface):
                 pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_ADD_OUR_DEVICE,
                 pEp.sync_handshake_signal.SYNC_NOTIFY_INIT_FORM_GROUP
             ):
+            end_on.extend([
+                    pEp.sync_handshake_signal.SYNC_NOTIFY_SOLE,
+                    pEp.sync_handshake_signal.SYNC_NOTIFY_IN_GROUP,
+                ])
             try:
                 if options.reject:
                     self.deliverHandshakeResult(SYNC_HANDSHAKE_REJECTED)
diff --git a/test/sync_test.py b/test/sync_test.py
index 1849305..b8ad700 100644
--- a/test/sync_test.py
+++ b/test/sync_test.py
@@ -110,6 +110,14 @@ if __name__ == "__main__":
         if options.cleanall:
             rmrf("Backup")
 
+        if options.setup_only:
+            os.makedirs("TestInbox", exist_ok=True)
+            setup("Phone")
+            setup("Laptop")
+            if options.third:
+                setup("Pad")
+
+
     elif options.backup:
         rmrf("Backup")