diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/MenuItems/TestSceneStatefulMenuItem.cs
similarity index 96%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
rename to osu.Game.Tests/Visual/UserInterface/MenuItems/TestSceneStatefulMenuItem.cs
index d010abc862..95e9aea97f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/MenuItems/TestSceneStatefulMenuItem.cs
@@ -7,14 +7,14 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Tests.Visual.UserInterface
+namespace osu.Game.Tests.Visual.UserInterface.MenuItems
 {
     public class TestSceneStatefulMenuItem : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(OsuMenu),
-            typeof(ToggleMenuItem),
+            typeof(StatefulMenuItem),
             typeof(DrawableStatefulMenuItem)
         };
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneThreeStateMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/MenuItems/TestSceneThreeStateMenuItem.cs
similarity index 95%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneThreeStateMenuItem.cs
rename to osu.Game.Tests/Visual/UserInterface/MenuItems/TestSceneThreeStateMenuItem.cs
index caa07e7b60..e035e43630 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneThreeStateMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/MenuItems/TestSceneThreeStateMenuItem.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Tests.Visual.UserInterface
+namespace osu.Game.Tests.Visual.UserInterface.MenuItems
 {
     public class TestSceneThreeStateMenuItem : OsuTestScene
     {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/MenuItems/TestSceneToggleMenuItem.cs
similarity index 94%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs
rename to osu.Game.Tests/Visual/UserInterface/MenuItems/TestSceneToggleMenuItem.cs
index 2abda56a28..92875740cf 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneToggleMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/MenuItems/TestSceneToggleMenuItem.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Tests.Visual.UserInterface
+namespace osu.Game.Tests.Visual.UserInterface.MenuItems
 {
     public class TestSceneToggleMenuItem : OsuTestScene
     {