diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index fe962d3cb8..06bdb562e4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
@@ -114,9 +114,9 @@ public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wra
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
 
-            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => null;
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => lookupFunction(this) ? this : null;
 
-            public IEnumerable<ISkin> AllSources => Enumerable.Empty<ISkin>();
+            public IEnumerable<ISkin> AllSources => new[] { this };
 
             public event Action SourceChanged
             {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 334d27e0a9..662cbaee68 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -167,9 +167,9 @@ public Drawable GetDrawableComponent(ISkinComponent component)
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
 
-            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => null;
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => lookupFunction(this) ? this : null;
 
-            public IEnumerable<ISkin> AllSources => Enumerable.Empty<ISkin>();
+            public IEnumerable<ISkin> AllSources => new[] { this };
 
             public event Action SourceChanged;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index 3317d8f80a..f29fbbf52b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -331,7 +331,7 @@ private class SkinSourceContainer : Container, ISkinSource
 
             public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => throw new NotImplementedException();
 
-            public IEnumerable<ISkin> AllSources => Enumerable.Empty<ISkin>();
+            public IEnumerable<ISkin> AllSources => throw new NotImplementedException();
 
             public event Action SourceChanged
             {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 59edb527eb..51f8b90c8f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -147,8 +147,8 @@ private class TestSkinSourceContainer : Container, ISkinSource, ISamplePlaybackD
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source?.GetTexture(componentName, wrapModeS, wrapModeT);
             public ISample GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source?.GetConfig<TLookup, TValue>(lookup);
-            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => source?.FindProvider(lookupFunction);
-            public IEnumerable<ISkin> AllSources => source.AllSources;
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => lookupFunction(this) ? this : source?.FindProvider(lookupFunction);
+            public IEnumerable<ISkin> AllSources => new[] { this }.Concat(source?.AllSources);
 
             public void TriggerSourceChanged()
             {
diff --git a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
index 86c75c297a..e0c2965fa0 100644
--- a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
@@ -159,8 +159,9 @@ public event Action SourceChanged
                 remove { }
             }
 
-            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => null;
-            public IEnumerable<ISkin> AllSources => Enumerable.Empty<ISkin>();
+            public ISkin FindProvider(Func<ISkin, bool> lookupFunction) => lookupFunction(this) ? this : null;
+
+            public IEnumerable<ISkin> AllSources => new[] { this };
         }
     }
 }