diff --git a/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs b/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs
new file mode 100644
index 0000000000..6de9d7c478
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.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.Graphics;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public abstract class SkinnableHUDComponentTestScene : SkinnableTestScene
+    {
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            SetContents(skin =>
+            {
+                var implementation = skin != null
+                    ? CreateLegacyImplementation()
+                    : CreateDefaultImplementation();
+
+                implementation.Anchor = Anchor.Centre;
+                implementation.Origin = Anchor.Centre;
+                return implementation;
+            });
+        });
+
+        protected abstract Drawable CreateDefaultImplementation();
+        protected abstract Drawable CreateLegacyImplementation();
+    }
+}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index 6f4e6a2420..80eb887894 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
@@ -3,26 +3,26 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSkinnableAccuracyCounter : SkinnableTestScene
+    public class TestSceneSkinnableAccuracyCounter : SkinnableHUDComponentTestScene
     {
-        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
-
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
+        protected override Drawable CreateDefaultImplementation() => new DefaultAccuracyCounter();
+        protected override Drawable CreateLegacyImplementation() => new LegacyAccuracyCounter();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
             AddStep("Set initial accuracy", () => scoreProcessor.Accuracy.Value = 1);
-            AddStep("Create accuracy counters", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter))));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
similarity index 56%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
index b22af0f7ac..1c5a05dd1d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableComboCounter.cs
@@ -3,26 +3,19 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Testing;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneComboCounter : SkinnableTestScene
+    public class TestSceneSkinnableComboCounter : SkinnableHUDComponentTestScene
     {
-        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
-
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
-        [SetUpSteps]
-        public void SetUpSteps()
-        {
-            AddStep("Create combo counters", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.ComboCounter))));
-        }
+        protected override Drawable CreateDefaultImplementation() => new DefaultComboCounter();
+        protected override Drawable CreateLegacyImplementation() => new LegacyComboCounter();
 
         [Test]
         public void TestComboCounterIncrementing()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index ead27bf017..057798c922 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -3,28 +3,28 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSkinnableHealthDisplay : SkinnableTestScene
+    public class TestSceneSkinnableHealthDisplay : SkinnableHUDComponentTestScene
     {
-        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
-
         [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
+        protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay();
+        protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create health displays", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.HealthDisplay))));
             AddStep(@"Reset all", delegate
             {
                 healthProcessor.Health.Value = 1;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index 8d633c3ca2..1700886263 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -3,26 +3,20 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Testing;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSkinnableScoreCounter : SkinnableTestScene
+    public class TestSceneSkinnableScoreCounter : SkinnableHUDComponentTestScene
     {
-        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
-
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
-        [SetUpSteps]
-        public void SetUpSteps()
-        {
-            AddStep("Create score counters", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.ScoreCounter))));
-        }
+        protected override Drawable CreateDefaultImplementation() => new DefaultScoreCounter();
+        protected override Drawable CreateLegacyImplementation() => new LegacyScoreCounter();
 
         [Test]
         public void TestScoreCounterIncrementing()