diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
index 3516e23f98..59491b7f90 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePageSelector.cs
@@ -3,8 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Game.Graphics.UserInterface;
+using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface.PageSelector;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -19,12 +20,19 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         public TestScenePageSelector()
         {
-            Child = pageSelector = new PageSelector
+            AddRange(new Drawable[]
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            };
+                pageSelector = new PageSelector
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+        }
 
+        [Test]
+        public void TestPageSelectorValues()
+        {
             AddStep("10 max pages", () => setMaxPages(10));
             AddStep("200 max pages, current 199", () =>
             {
diff --git a/osu.Game/Graphics/UserInterface/PageSelector.cs b/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
similarity index 99%
rename from osu.Game/Graphics/UserInterface/PageSelector.cs
rename to osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
index c9f0f3c74d..6767cb3a75 100644
--- a/osu.Game/Graphics/UserInterface/PageSelector.cs
+++ b/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
@@ -16,7 +16,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 
-namespace osu.Game.Graphics.UserInterface
+namespace osu.Game.Graphics.UserInterface.PageSelector
 {
     public class PageSelector : CompositeDrawable
     {