diff --git a/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs b/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
index 6621344b6e..9c43690a95 100644
--- a/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
+++ b/osu.Game.Tests/Gameplay/HitObjectSampleTest.cs
@@ -16,7 +16,6 @@ using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
-using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
 using osu.Game.Users;
 
@@ -24,6 +23,8 @@ namespace osu.Game.Tests.Gameplay
 {
     public abstract class HitObjectSampleTest : PlayerTestScene
     {
+        protected abstract IResourceStore<byte[]> Resources { get; }
+
         private readonly SkinInfo userSkinInfo = new SkinInfo();
 
         private readonly BeatmapInfo beatmapInfo = new BeatmapInfo
@@ -61,7 +62,7 @@ namespace osu.Game.Tests.Gameplay
 
                 AddStep($"load {filename}", () =>
                 {
-                    using (var reader = new LineBufferedReader(TestResources.OpenResource($"SampleLookups/{filename}")))
+                    using (var reader = new LineBufferedReader(Resources.GetStream($"Resources/SampleLookups/{filename}")))
                         currentTestBeatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
                 });
             });
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
index 6144179d31..78bdfeb80e 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests.Gameplay
 {
@@ -12,6 +14,7 @@ namespace osu.Game.Tests.Gameplay
     public class TestSceneHitObjectSamples : HitObjectSampleTest
     {
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+        protected override IResourceStore<byte[]> Resources => TestResources.GetStore();
 
         /// <summary>
         /// Tests that a hitobject which provides no custom sample set retrieves samples from the user skin.