diff --git a/osu.Game.Tests/Visual/TestCaseEditorSetupCircularButton.cs b/osu.Game.Tests/Visual/TestCaseEditorSetupCircularButton.cs
new file mode 100644
index 0000000000..77cc6dbb9d
--- /dev/null
+++ b/osu.Game.Tests/Visual/TestCaseEditorSetupCircularButton.cs
@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Screens.Edit.Screens.Setup.Components;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCaseEditorSetupCircularButton : OsuTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(SetupCircularButton)
+        };
+
+        private readonly SetupCircularButton circularButton;
+
+        public TestCaseEditorSetupCircularButton()
+        {
+            Child = circularButton = new SetupCircularButton
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                LabelText = "Button",
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour osuColour)
+        {
+            circularButton.DefaultColour = osuColour.Blue;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Screens/Setup/Components/OsuSetupCircularButton.cs b/osu.Game/Screens/Edit/Screens/Setup/Components/SetupCircularButton.cs
similarity index 96%
rename from osu.Game/Screens/Edit/Screens/Setup/Components/OsuSetupCircularButton.cs
rename to osu.Game/Screens/Edit/Screens/Setup/Components/SetupCircularButton.cs
index ae22f38a08..877c398be8 100644
--- a/osu.Game/Screens/Edit/Screens/Setup/Components/OsuSetupCircularButton.cs
+++ b/osu.Game/Screens/Edit/Screens/Setup/Components/SetupCircularButton.cs
@@ -14,7 +14,7 @@ using System;
 
 namespace osu.Game.Screens.Edit.Screens.Setup.Components
 {
-    public class OsuSetupCircularButton : Container, IHasAccentColour
+    public class SetupCircularButton : Container, IHasAccentColour
     {
         private readonly Box fill;
         private readonly OsuSpriteText label;
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Edit.Screens.Setup.Components
             }
         }
 
-        public OsuSetupCircularButton()
+        public SetupCircularButton()
         {
             Size = new Vector2(SIZE_X, SIZE_Y);
             CornerRadius = 15;