diff --git a/python/tests/test_account.py b/python/tests/test_account.py
index a78302ec5..cfcbeb87c 100644
--- a/python/tests/test_account.py
+++ b/python/tests/test_account.py
@@ -993,22 +993,20 @@ class TestOnlineAccount:
 
     def test_message_override_sender_name(self, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
+        chat = acfactory.get_accepted_chat(ac1, ac2)
         overridden_name = "someone else"
 
         ac1.set_config("displayname", "ac1")
 
-        lp.sec("ac1: create chat with ac2")
-        chat = ac1.create_chat(ac2)
-
         lp.sec("sending text message with overridden name from ac1 to ac2")
         msg1 = Message.new_empty(ac1, "text")
         msg1.set_override_sender_name(overridden_name)
         msg1.set_text("message1")
         msg1 = chat.send_msg(msg1)
-        ac1._evtracker.wait_msg_delivered(msg1)
+        assert msg1.override_sender_name == overridden_name
 
         lp.sec("wait for ac2 to receive message")
-        msg2 = ac2._evtracker.wait_next_messages_changed()
+        msg2 = ac2._evtracker.wait_next_incoming_message()
         assert msg2.text == "message1"
         assert msg2.get_sender_contact().name == ac1.get_config("displayname")
         assert msg2.override_sender_name == overridden_name