diff --git a/python/tests/test_2_increation.py b/python/tests/test_2_increation.py
index 320d245cd..1fe85e02a 100644
--- a/python/tests/test_2_increation.py
+++ b/python/tests/test_2_increation.py
@@ -68,13 +68,16 @@ class TestOnlineInCreation:
         assert prepared_original.is_out_preparing()
         wait_msgs_changed(ac1, [(chat.id, prepared_original.id)])
 
-        lp.sec("forward the message while still in creation")
+        lp.sec("create a new group")
         chat2 = ac1.create_group_chat("newgroup")
+        wait_msgs_changed(ac1, [(0, 0)])
+
+        lp.sec("add a contact to new group")
         chat2.add_contact(ac2)
-        ac1._evtracker.consume_events()
+        wait_msgs_changed(ac1, [(chat2.id, None)])
+
+        lp.sec("forward the message while still in creation")
         ac1.forward_messages([prepared_original], chat2)
-        # XXX there might be two EVENT_MSGS_CHANGED and only one of them
-        # is the one caused by forwarding
         forwarded_id = wait_msgs_changed(ac1, [(chat2.id, None)])
         forwarded_msg = ac1.get_message_by_id(forwarded_id)
         assert forwarded_msg.is_out_preparing()