diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectV2.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectV2.cs
index 0a632793cc..02f503d433 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectV2.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectV2.cs
@@ -17,7 +17,6 @@ using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens;
 using osu.Game.Screens.Footer;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.SelectV2;
 using osu.Game.Screens.SelectV2.Footer;
 using osuTK.Input;
 
@@ -63,8 +62,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             base.SetUpSteps();
 
-            AddStep("load screen", () => Stack.Push(new SongSelectV2()));
-            AddUntilStep("wait for load", () => Stack.CurrentScreen is SongSelectV2 songSelect && songSelect.IsLoaded);
+            AddStep("load screen", () => Stack.Push(new Screens.SelectV2.SongSelectV2()));
+            AddUntilStep("wait for load", () => Stack.CurrentScreen is Screens.SelectV2.SongSelectV2 songSelect && songSelect.IsLoaded);
         }
 
         #region Footer
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectV2Navigation.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectV2Navigation.cs
index ededb80228..0ca27c539a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectV2Navigation.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectV2Navigation.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.SelectV2;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.SongSelect
@@ -17,7 +16,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             base.SetUpSteps();
             AddStep("press enter", () => InputManager.Key(Key.Enter));
             AddWaitStep("wait", 5);
-            PushAndConfirm(() => new SongSelectV2());
+            PushAndConfirm(() => new Screens.SelectV2.SongSelectV2());
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/SongSelectV2/SongSelectComponentsTestScene.cs b/osu.Game.Tests/Visual/SongSelectV2/SongSelectComponentsTestScene.cs
new file mode 100644
index 0000000000..ff81d72d12
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelectV2/SongSelectComponentsTestScene.cs
@@ -0,0 +1,45 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.SongSelectV2
+{
+    public abstract partial class SongSelectComponentsTestScene : OsuTestScene
+    {
+        [Cached]
+        protected readonly OverlayColourProvider ColourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
+        /// <summary>
+        /// The beatmap. Can be local/online depending on the context.
+        /// </summary>
+        [Cached(typeof(IBindable<IBeatmapInfo?>))]
+        protected readonly Bindable<IBeatmapInfo?> BeatmapInfo = new Bindable<IBeatmapInfo?>();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // mimics song select's `WorkingBeatmap` binding
+            Beatmap.BindValueChanged(b =>
+            {
+                BeatmapInfo.Value = b.NewValue.BeatmapInfo;
+            });
+        }
+
+        [SetUpSteps]
+        public virtual void SetUpSteps()
+        {
+            AddStep("reset dependencies", () =>
+            {
+                Beatmap.SetDefault();
+                SelectedMods.SetDefault();
+                BeatmapInfo.Value = null;
+            });
+        }
+    }
+}