diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 81a44f9f8a..98b8e3c5d6 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -104,6 +104,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
+            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+
             WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
@@ -129,6 +131,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
+            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+
             WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
@@ -154,6 +158,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
+            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+
             WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);
@@ -183,6 +189,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
+            AddUntilStep("wait for initial selection", () => !Beatmap.IsDefault);
+
             WorkingBeatmap selected = null;
 
             AddStep("store selected beatmap", () => selected = Beatmap.Value);