diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index f36459dc76..e5f8ad5402 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
@@ -16,36 +15,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public float X { get; set; }
 
-        public Color4 ComboColour
-        {
-            get
-            {
-                switch (VisualRepresentation)
-                {
-                    default:
-                    case FruitVisualRepresentation.Triforce:
-                        return new Color4(17, 136, 170, 255);
-                    case FruitVisualRepresentation.Grape:
-                        return new Color4(204, 102, 0, 255);
-                    case FruitVisualRepresentation.DPad:
-                        return new Color4(121, 9, 13, 255);
-                    case FruitVisualRepresentation.Pineapple:
-                        return new Color4(102, 136, 0, 255);
-                    case FruitVisualRepresentation.Banana:
-                        switch (RNG.Next(0, 3))
-                        {
-                            default:
-                                return new Color4(255, 240, 0, 255);
-                            case 1:
-                                return new Color4(255, 192, 0, 255);
-                            case 2:
-                                return new Color4(214, 221, 28, 255);
-                        }
-                }
-            }
-
-            set { }
-        }
+        public Color4 ComboColour { get; set; }
 
         public int IndexInBeatmap { get; set; }
 
diff --git a/osu.Game.Rulesets.Catch/Tests/TestCaseFruitObjects.cs b/osu.Game.Rulesets.Catch/Tests/TestCaseFruitObjects.cs
index 975795863f..0b7bc3b186 100644
--- a/osu.Game.Rulesets.Catch/Tests/TestCaseFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch/Tests/TestCaseFruitObjects.cs
@@ -5,11 +5,13 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using osu.Game.Tests.Visual;
 using OpenTK;
+using OpenTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -49,19 +51,52 @@ namespace osu.Game.Rulesets.Catch.Tests
             });
         }
 
-        private DrawableFruit createDrawable(int index) => new DrawableFruit(new Fruit
+        private DrawableFruit createDrawable(int index)
         {
-            StartTime = 1000000000000,
-            IndexInBeatmap = index,
-            Scale = 1.5f,
-        })
+            var fruit = new Fruit
+            {
+                StartTime = 1000000000000,
+                IndexInBeatmap = index,
+                Scale = 1.5f,
+            };
+
+            fruit.ComboColour = colourForRrepesentation(fruit.VisualRepresentation);
+
+            return new DrawableFruit(fruit)
+            {
+                Anchor = Anchor.Centre,
+                RelativePositionAxes = Axes.Both,
+                Position = Vector2.Zero,
+                Alpha = 1,
+                LifetimeStart = double.NegativeInfinity,
+                LifetimeEnd = double.PositiveInfinity,
+            };
+        }
+
+        private Color4 colourForRrepesentation(FruitVisualRepresentation representation)
         {
-            Anchor = Anchor.Centre,
-            RelativePositionAxes = Axes.Both,
-            Position = Vector2.Zero,
-            Alpha = 1,
-            LifetimeStart = double.NegativeInfinity,
-            LifetimeEnd = double.PositiveInfinity,
-        };
+            switch (representation)
+            {
+                default:
+                case FruitVisualRepresentation.Triforce:
+                    return new Color4(17, 136, 170, 255);
+                case FruitVisualRepresentation.Grape:
+                    return new Color4(204, 102, 0, 255);
+                case FruitVisualRepresentation.DPad:
+                    return new Color4(121, 9, 13, 255);
+                case FruitVisualRepresentation.Pineapple:
+                    return new Color4(102, 136, 0, 255);
+                case FruitVisualRepresentation.Banana:
+                    switch (RNG.Next(0, 3))
+                    {
+                        default:
+                            return new Color4(255, 240, 0, 255);
+                        case 1:
+                            return new Color4(255, 192, 0, 255);
+                        case 2:
+                            return new Color4(214, 221, 28, 255);
+                    }
+            }
+        }
     }
 }