diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index a87b22affe..d76f354774 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
@@ -50,5 +51,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             if (joinRoom)
                 RoomManager.Schedule(() => RoomManager.CreateRoom(Room));
         });
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            if (joinRoom)
+                AddUntilStep("wait for room join", () => Client.Room != null);
+        }
     }
 }