diff --git a/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs b/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
index 5484824c5b..7d486fc56c 100644
--- a/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
+++ b/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
@@ -9,7 +9,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Input.States;
@@ -54,7 +53,7 @@ namespace osu.Game.Tests.Visual
         private BeatmapManager manager;
         private RulesetStore rulesets;
 
-        private ScreenStackCacheContainer screenStackContainer;
+        private OsuScreenStack screenStack;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host)
@@ -85,8 +84,8 @@ namespace osu.Game.Tests.Visual
                 manager.Delete(manager.GetAllUsableBeatmapSets());
                 var temp = TestResources.GetTestBeatmapForImport();
                 manager.Import(temp);
-                Child = screenStackContainer = new ScreenStackCacheContainer { RelativeSizeAxes = Axes.Both };
-                screenStackContainer.ScreenStack.Push(songSelect = new DummySongSelect());
+                Child = screenStack = new OsuScreenStack() { RelativeSizeAxes = Axes.Both };
+                screenStack.Push(songSelect = new DummySongSelect());
             });
         }
 
@@ -354,20 +353,6 @@ namespace osu.Game.Tests.Visual
             }
         }
 
-        private class ScreenStackCacheContainer : Container
-        {
-            [Cached]
-            private BackgroundScreenStack backgroundScreenStack;
-
-            public readonly ScreenStack ScreenStack;
-
-            public ScreenStackCacheContainer()
-            {
-                Add(backgroundScreenStack = new BackgroundScreenStack { RelativeSizeAxes = Axes.Both });
-                Add(ScreenStack = new ScreenStack { RelativeSizeAxes = Axes.Both });
-            }
-        }
-
         private class DimAccessiblePlayerLoader : PlayerLoader
         {
             public VisualSettings VisualSettingsPos => VisualSettings;
diff --git a/osu.Game.Tests/Visual/TestCaseMultiHeader.cs b/osu.Game.Tests/Visual/TestCaseMultiHeader.cs
index f7802e2d08..d7d8073a33 100644
--- a/osu.Game.Tests/Visual/TestCaseMultiHeader.cs
+++ b/osu.Game.Tests/Visual/TestCaseMultiHeader.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual
         {
             int index = 0;
 
-            ScreenStack screenStack = new ScreenStack(new TestMultiplayerSubScreen(index)) { RelativeSizeAxes = Axes.Both };
+            OsuScreenStack screenStack = new OsuScreenStack(new TestMultiplayerSubScreen(index)) { RelativeSizeAxes = Axes.Both };
 
             Children = new Drawable[]
             {
diff --git a/osu.Game.Tests/Visual/TestCasePlayerLoader.cs b/osu.Game.Tests/Visual/TestCasePlayerLoader.cs
index 244f553e97..0e6a237325 100644
--- a/osu.Game.Tests/Visual/TestCasePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/TestCasePlayerLoader.cs
@@ -14,15 +14,11 @@ namespace osu.Game.Tests.Visual
     public class TestCasePlayerLoader : ManualInputManagerTestCase
     {
         private PlayerLoader loader;
-        private readonly ScreenStack stack;
-
-        [Cached]
-        private BackgroundScreenStack backgroundStack;
+        private readonly OsuScreenStack stack;
 
         public TestCasePlayerLoader()
         {
-            InputManager.Add(backgroundStack = new BackgroundScreenStack { RelativeSizeAxes = Axes.Both });
-            InputManager.Add(stack = new ScreenStack { RelativeSizeAxes = Axes.Both });
+            InputManager.Add(stack = new OsuScreenStack { RelativeSizeAxes = Axes.Both });
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs b/osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs
index 204f4a493d..697d2405ba 100644
--- a/osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs
+++ b/osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs
@@ -19,14 +19,14 @@ namespace osu.Game.Tests.Visual
     public class TestCaseScreenBreadcrumbControl : OsuTestCase
     {
         private readonly ScreenBreadcrumbControl breadcrumbs;
-        private readonly ScreenStack screenStack;
+        private readonly OsuScreenStack screenStack;
 
         public TestCaseScreenBreadcrumbControl()
         {
             OsuSpriteText titleText;
 
             IScreen startScreen = new TestScreenOne();
-            screenStack = new ScreenStack(startScreen) { RelativeSizeAxes = Axes.Both };
+            screenStack = new OsuScreenStack(startScreen) { RelativeSizeAxes = Axes.Both };
 
             Children = new Drawable[]
             {
diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index 71b0b02fa6..7af925f7ee 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.cs
@@ -6,6 +6,7 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
+using osu.Game.Screens;
 using osu.Game.Screens.Backgrounds;
 
 namespace osu.Game.Tests
diff --git a/osu.Game/Tests/Visual/ScreenTestCase.cs b/osu.Game/Tests/Visual/ScreenTestCase.cs
index 79c57ad9f4..dd8aed8af3 100644
--- a/osu.Game/Tests/Visual/ScreenTestCase.cs
+++ b/osu.Game/Tests/Visual/ScreenTestCase.cs
@@ -13,17 +13,13 @@ namespace osu.Game.Tests.Visual
     /// </summary>
     public abstract class ScreenTestCase : OsuTestCase
     {
-        private readonly ScreenStack stack;
-
-        [Cached]
-        private BackgroundScreenStack backgroundStack;
+        private readonly OsuScreenStack stack;
 
         protected ScreenTestCase()
         {
             Children = new Drawable[]
             {
-                backgroundStack = new BackgroundScreenStack { RelativeSizeAxes = Axes.Both },
-                stack = new ScreenStack { RelativeSizeAxes = Axes.Both }
+                stack = new OsuScreenStack { RelativeSizeAxes = Axes.Both }
             };
         }