diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index add851ebf3..23b5ad0bd8 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -21,6 +21,19 @@ namespace osu.Game.Tests.Visual
             AddStep("set test data", () => currentTestData = testData);
         });
 
+        public override void TearDownSteps()
+        {
+            AddUntilStep("test passed", () =>
+            {
+                if (currentTestData == null)
+                    return true;
+
+                return currentTestData.PassCondition?.Invoke() ?? false;
+            });
+
+            base.TearDownSteps();
+        }
+
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
 
         protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index 067d8faf54..33cc00e748 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -33,8 +33,8 @@ namespace osu.Game.Tests.Visual
         [SetUpSteps]
         public virtual void SetUpSteps() => addExitAllScreensStep();
 
-        // [TearDownSteps]
-        // public virtual void TearDownSteps() => addExitAllScreensStep();
+        [TearDownSteps]
+        public virtual void TearDownSteps() => addExitAllScreensStep();
 
         private void addExitAllScreensStep()
         {