diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneInstantResume.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutopilot.cs
similarity index 66%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneInstantResume.cs
rename to osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutopilot.cs
index 2bc6386185..37b31d1d1a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneInstantResume.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutopilot.cs
@@ -3,26 +3,23 @@
 
 using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Tests.Visual;
 using osuTK.Input;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public partial class TestSceneInstantResume : TestSceneOsuPlayer
+    public partial class TestSceneOsuModAutopilot : OsuModTestScene
     {
-        protected override bool HasCustomSteps => true;
-
-        protected override TestPlayer CreatePlayer(Ruleset ruleset)
-        {
-            SelectedMods.Value = new[] { new OsuModAutopilot() };
-            return new TestPlayer();
-        }
-
         [Test]
         public void TestInstantResume()
         {
-            CreateTest();
+            CreateModTest(new ModTestData
+            {
+                Mod = new OsuModAutopilot(),
+                PassCondition = () => true,
+                Autoplay = false,
+            });
 
+            AddUntilStep("wait for gameplay start", () => Player.LocalUserPlaying.Value);
             AddStep("press pause", () => InputManager.PressKey(Key.Escape));
             AddUntilStep("wait until paused", () => Player.GameplayClockContainer.IsPaused.Value);
             AddStep("release pause", () => InputManager.ReleaseKey(Key.Escape));
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 0559d80384..aa5b506343 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual
             protected override bool CheckModsAllowFailure() => allowFail;
 
             public ModTestPlayer(ModTestData data, bool allowFail)
-                : base(false, false)
+                : base(true, false)
             {
                 this.allowFail = allowFail;
                 currentTestData = data;