diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs
index 458f81c7af..1534b1174b 100644
--- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs
@@ -37,10 +37,6 @@ namespace osu.Game.Tests.Visual.SongSelectV2
 
             AddAssert("beatmap imported", () => Beatmaps.GetAllUsableBeatmapSets().Any(), () => Is.True);
 
-            // song select should automatically select the beatmap for us but this is not implemented yet.
-            // todo: remove when that's the case.
-            AddAssert("no beatmap selected", () => Beatmap.IsDefault);
-            AddStep("select beatmap", () => Beatmap.Value = Beatmaps.GetWorkingBeatmap(Beatmaps.GetAllUsableBeatmapSets().Single().Beatmaps.First()));
             AddAssert("beatmap selected", () => !Beatmap.IsDefault);
 
             AddStep("import score", () =>
@@ -91,11 +87,6 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             ImportBeatmapForRuleset(0);
 
             AddAssert("beatmap imported", () => Beatmaps.GetAllUsableBeatmapSets().Any(), () => Is.True);
-
-            // song select should automatically select the beatmap for us but this is not implemented yet.
-            // todo: remove when that's the case.
-            AddAssert("no beatmap selected", () => Beatmap.IsDefault);
-            AddStep("select beatmap", () => Beatmap.Value = Beatmaps.GetWorkingBeatmap(Beatmaps.GetAllUsableBeatmapSets().Single().Beatmaps.First()));
             AddAssert("beatmap selected", () => !Beatmap.IsDefault);
 
             AddStep("press shift-delete", () =>
@@ -254,11 +245,6 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             ImportBeatmapForRuleset(0);
 
             LoadSongSelect();
-
-            // song select should automatically select the beatmap for us but this is not implemented yet.
-            // todo: remove when that's the case.
-            AddAssert("no beatmap selected", () => Beatmap.IsDefault);
-            AddStep("select beatmap", () => Beatmap.Value = Beatmaps.GetWorkingBeatmap(Beatmaps.GetAllUsableBeatmapSets().Single().Beatmaps.First()));
             AddStep("press right", () => InputManager.Key(Key.Right)); // press right to select in carousel, also remove.
             AddAssert("beatmap selected", () => !Beatmap.IsDefault);
 
@@ -284,11 +270,6 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             ImportBeatmapForRuleset(0);
 
             LoadSongSelect();
-
-            // song select should automatically select the beatmap for us but this is not implemented yet.
-            // todo: remove when that's the case.
-            AddAssert("no beatmap selected", () => Beatmap.IsDefault);
-            AddStep("select beatmap", () => Beatmap.Value = Beatmaps.GetWorkingBeatmap(Beatmaps.GetAllUsableBeatmapSets().Single().Beatmaps.First()));
             AddStep("press right", () => InputManager.Key(Key.Right)); // press right to select in carousel, also remove.
             AddAssert("beatmap selected", () => !Beatmap.IsDefault);
 
@@ -316,11 +297,6 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             ImportBeatmapForRuleset(0);
 
             LoadSongSelect();
-
-            // song select should automatically select the beatmap for us but this is not implemented yet.
-            // todo: remove when that's the case.
-            AddAssert("no beatmap selected", () => Beatmap.IsDefault);
-            AddStep("select beatmap", () => Beatmap.Value = Beatmaps.GetWorkingBeatmap(Beatmaps.GetAllUsableBeatmapSets().Single().Beatmaps.First()));
             AddStep("press right", () => InputManager.Key(Key.Right)); // press right to select in carousel, also remove.
             AddAssert("beatmap selected", () => !Beatmap.IsDefault);
 
@@ -461,11 +437,6 @@ namespace osu.Game.Tests.Visual.SongSelectV2
             LoadSongSelect();
 
             ImportBeatmapForRuleset(0);
-
-            // song select should automatically select the beatmap for us but this is not implemented yet.
-            // todo: remove when that's the case.
-            AddAssert("no beatmap selected", () => Beatmap.IsDefault);
-            AddStep("select beatmap", () => Beatmap.Value = Beatmaps.GetWorkingBeatmap(Beatmaps.GetAllUsableBeatmapSets().Single().Beatmaps.First()));
             AddAssert("options enabled", () => this.ChildrenOfType<FooterButtonOptions>().Single().Enabled.Value);
 
             AddStep("click", () => this.ChildrenOfType<FooterButtonOptions>().Single().TriggerClick());
@@ -523,16 +494,9 @@ namespace osu.Game.Tests.Visual.SongSelectV2
 
             ImportBeatmapForRuleset(0);
 
-            // song select should automatically select the beatmap for us but this is not implemented yet.
-            // todo: remove when that's the case.
-            AddAssert("no beatmap selected", () => Beatmap.IsDefault);
-            AddStep("select beatmap", () => Beatmap.Value = Beatmaps.GetWorkingBeatmap(Beatmaps.GetAllUsableBeatmapSets().Single().Beatmaps.First()));
-
             AddAssert("options enabled", () => this.ChildrenOfType<FooterButtonOptions>().Single().Enabled.Value);
             AddStep("delete all beatmaps", () => Beatmaps.Delete());
 
-            // song select should automatically select the beatmap for us but this is not implemented yet.
-            // todo: remove when that's the case.
             AddAssert("beatmap selected", () => !Beatmap.IsDefault);
             AddStep("select no beatmap", () => Beatmap.SetDefault());
 
diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectFiltering.cs b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectFiltering.cs
index c0c80e0bc3..9532895edd 100644
--- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectFiltering.cs
+++ b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectFiltering.cs
@@ -254,11 +254,6 @@ namespace osu.Game.Tests.Visual.SongSelectV2
 
             checkMatchedBeatmaps(3);
 
-            // song select should automatically select the beatmap for us but this is not implemented yet.
-            // todo: remove when that's the case.
-            AddAssert("no beatmap selected", () => Beatmap.IsDefault);
-            AddStep("select beatmap", () => Beatmap.Value = Beatmaps.GetWorkingBeatmap(Beatmaps.GetAllUsableBeatmapSets().Single().Beatmaps.First()));
-
             AddStep("hide", () => Beatmaps.Hide(Beatmap.Value.BeatmapInfo));
 
             checkMatchedBeatmaps(2);