diff --git a/osu.Game.Rulesets.Catch/Tests/TestCaseCatchPlayer.cs b/osu.Game.Rulesets.Catch/Tests/TestCaseCatchPlayer.cs
index 8d18a712d8..45ab8ac300 100644
--- a/osu.Game.Rulesets.Catch/Tests/TestCaseCatchPlayer.cs
+++ b/osu.Game.Rulesets.Catch/Tests/TestCaseCatchPlayer.cs
@@ -10,6 +10,10 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestCaseCatchPlayer : Game.Tests.Visual.TestCasePlayer
     {
+        public TestCaseCatchPlayer() : base(typeof(CatchRuleset))
+        {
+            
+        }
         protected override Beatmap CreateBeatmap()
         {
             var beatmap = new Beatmap();
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 5eef4a8470..407a5f7c3c 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -38,7 +38,6 @@ namespace osu.Game.Rulesets
 
         protected override void Prepare(bool reset = false)
         {
-
             Connection.CreateTable<RulesetInfo>();
 
             if (reset)
diff --git a/osu.Game/Tests/Visual/TestCasePlayer.cs b/osu.Game/Tests/Visual/TestCasePlayer.cs
index 4a25a52e36..b0953ceb7e 100644
--- a/osu.Game/Tests/Visual/TestCasePlayer.cs
+++ b/osu.Game/Tests/Visual/TestCasePlayer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -18,31 +19,39 @@ namespace osu.Game.Tests.Visual
 {
     public class TestCasePlayer : OsuTestCase
     {
+        private readonly Type ruleset;
+
         protected Player Player;
-        private RulesetStore rulesets;
 
         public override string Description => @"Showing everything to play the game.";
 
+        /// <summary>
+        /// Create a TestCase which runs through the Player screen.
+        /// </summary>
+        /// <param name="ruleset">An optional ruleset type which we want to target. If not provided we'll allow all rulesets to be tested.</param>
+        protected TestCasePlayer(Type ruleset)
+        {
+            this.ruleset = ruleset;
+        }
+
+        public TestCasePlayer()
+        {
+
+        }
+
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
-            this.rulesets = rulesets;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
             Add(new Box
             {
                 RelativeSizeAxes = Framework.Graphics.Axes.Both,
                 Colour = Color4.Black,
             });
 
-            foreach (var r in rulesets.Query<RulesetInfo>())
-                AddStep(r.Name, () => loadPlayerFor(r));
+            string instantiation = ruleset?.AssemblyQualifiedName;
 
-            loadPlayerFor(rulesets.Query<RulesetInfo>().First());
+            foreach (var r in rulesets.Query<RulesetInfo>(rs => rs.Available && (instantiation == null || rs.InstantiationInfo == instantiation)))
+                AddStep(r.Name, () => loadPlayerFor(r));
         }
 
         protected virtual Beatmap CreateBeatmap()