diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index ca0f2b8012..0c452f857f 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -69,22 +69,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 Ruleset.Value = new OsuRuleset().RulesetInfo;
                 Beatmap.SetDefault();
+
+                songSelect = null;
             });
 
             AddStep("delete all beatmaps", () => manager?.Delete());
         }
 
-        public override void TearDownSteps()
-        {
-            base.TearDownSteps();
-
-            AddStep("remove song select", () =>
-            {
-                songSelect?.Expire();
-                songSelect = null;
-            });
-        }
-
         [Test]
         public void TestSingleFilterOnEnter()
         {