diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/default-skin/cursor@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/default-skin/cursor@2x.png
new file mode 100755
index 0000000000..75f9ba5ea6
Binary files /dev/null and b/osu.Game.Rulesets.Osu.Tests/Resources/default-skin/cursor@2x.png differ
diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/default-skin/cursormiddle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/default-skin/cursormiddle@2x.png
new file mode 100755
index 0000000000..ebf59c18ba
Binary files /dev/null and b/osu.Game.Rulesets.Osu.Tests/Resources/default-skin/cursormiddle@2x.png differ
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 1b1cfa89c0..ebb6cd3a5a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -6,29 +6,23 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Cursor;
-using osu.Game.Graphics.Cursor;
 using osu.Game.Rulesets.Osu.UI.Cursor;
-using osu.Game.Rulesets.UI;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneGameplayCursor : OsuTestScene, IProvideCursor
+    public class TestSceneGameplayCursor : SkinnableTestScene
     {
-        private GameplayCursorContainer cursorContainer;
-
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(CursorTrail) };
 
-        public CursorContainer Cursor => cursorContainer;
-
-        public bool ProvidingUserCursor => true;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            Add(cursorContainer = new OsuCursorContainer { RelativeSizeAxes = Axes.Both });
+            SetContents(() => new OsuCursorContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+            });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkin.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkin.cs
index 27bfdc315b..0295a419ac 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkin.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkin.cs
@@ -84,7 +84,7 @@ public Drawable GetDrawableComponent(string componentName)
                     return null;
 
                 case "Play/osu/cursor":
-                    if (GetTexture("cursor") != null)
+                    if (source.GetTexture("cursor") != null)
                         return new LegacyCursor();
 
                     return null;