diff --git a/osu.Game.Rulesets.Catch/Tests/TestCaseCatchPlayer.cs b/osu.Game.Rulesets.Catch/Tests/TestCaseCatchPlayer.cs
new file mode 100644
index 0000000000..55e6d8d226
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Tests/TestCaseCatchPlayer.cs
@@ -0,0 +1,20 @@
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Objects;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestCaseCatchPlayer : Game.Tests.Visual.TestCasePlayer
+    {
+        protected override Beatmap CreateBeatmap()
+        {
+            var beatmap = new Beatmap();
+
+            for (int i = 0; i < 256; i++)
+                beatmap.HitObjects.Add(new Fruit { X = 0.5f, StartTime = i * 100, NewCombo = i % 8 == 0 });
+
+            return beatmap;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
index 43124e4146..323a934e27 100644
--- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
+++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
@@ -58,6 +58,7 @@
     <Compile Include="Objects\Fruit.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tests\TestCaseCatcher.cs" />
+    <Compile Include="Tests\TestCaseCatchPlayer.cs" />
     <Compile Include="UI\CatcherArea.cs" />
     <Compile Include="UI\CatchRulesetContainer.cs" />
     <Compile Include="UI\CatchPlayfield.cs" />
diff --git a/osu.Game/Tests/Visual/TestCasePlayer.cs b/osu.Game/Tests/Visual/TestCasePlayer.cs
index 49146c4173..4a25a52e36 100644
--- a/osu.Game/Tests/Visual/TestCasePlayer.cs
+++ b/osu.Game/Tests/Visual/TestCasePlayer.cs
@@ -16,7 +16,7 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Tests.Visual
 {
-    internal class TestCasePlayer : OsuTestCase
+    public class TestCasePlayer : OsuTestCase
     {
         protected Player Player;
         private RulesetStore rulesets;
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual
             loadPlayerFor(rulesets.Query<RulesetInfo>().First());
         }
 
-        private void loadPlayerFor(RulesetInfo r)
+        protected virtual Beatmap CreateBeatmap()
         {
             Beatmap beatmap;
 
@@ -53,6 +53,13 @@ namespace osu.Game.Tests.Visual
             using (var reader = new StreamReader(stream))
                 beatmap = BeatmapDecoder.GetDecoder(reader).Decode(reader);
 
+            return beatmap;
+        }
+
+        private void loadPlayerFor(RulesetInfo r)
+        {
+            var beatmap = CreateBeatmap();
+
             beatmap.BeatmapInfo.Ruleset = r;
 
             var instance = r.CreateInstance();