diff --git a/osu.Game.Tests/Resources/Archives/ogg-beatmap.osz b/osu.Game.Tests/Resources/Archives/ogg-beatmap.osz
new file mode 100644
index 0000000000..f264a8dda2
Binary files /dev/null and b/osu.Game.Tests/Resources/Archives/ogg-beatmap.osz differ
diff --git a/osu.Game.Tests/Resources/Archives/ogg-skin.osk b/osu.Game.Tests/Resources/Archives/ogg-skin.osk
new file mode 100644
index 0000000000..d7379446aa
Binary files /dev/null and b/osu.Game.Tests/Resources/Archives/ogg-skin.osk differ
diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
new file mode 100644
index 0000000000..4d3b73fb32
--- /dev/null
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -0,0 +1,37 @@
+// 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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Testing;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.IO.Archives;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Skins
+{
+    [HeadlessTest]
+    public class TestSceneBeatmapSkinResources : OsuTestScene
+    {
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        private WorkingBeatmap beatmap;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var imported = beatmaps.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-beatmap.osz"))).Result;
+            beatmap = beatmaps.GetWorkingBeatmap(imported.Beatmaps[0]);
+        }
+
+        [Test]
+        public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo("sample")) != null);
+
+        [Test]
+        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => !(beatmap.Track is TrackVirtual));
+    }
+}
diff --git a/osu.Game.Tests/Skins/TestSceneSkinResources.cs b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
new file mode 100644
index 0000000000..107a96292f
--- /dev/null
+++ b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
@@ -0,0 +1,33 @@
+// 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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Audio;
+using osu.Game.IO.Archives;
+using osu.Game.Skinning;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Skins
+{
+    [HeadlessTest]
+    public class TestSceneSkinResources : OsuTestScene
+    {
+        [Resolved]
+        private SkinManager skins { get; set; }
+
+        private ISkin skin;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var imported = skins.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-skin.osk"))).Result;
+            skin = skins.GetSkin(imported);
+        }
+
+        [Test]
+        public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => skin.GetSample(new SampleInfo("sample")) != null);
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 94611317d5..29bcd2e210 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -54,6 +54,8 @@ namespace osu.Game.Skinning
             {
                 Samples = audioManager?.GetSampleStore(storage);
                 Textures = new TextureStore(new TextureLoaderStore(storage));
+
+                (storage as ResourceStore<byte[]>)?.AddExtension("ogg");
             }
         }