diff --git a/osu.Game.Tournament.Tests/TestSceneDrawableTournamentMatch.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
similarity index 97%
rename from osu.Game.Tournament.Tests/TestSceneDrawableTournamentMatch.cs
rename to osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
index c3a4519597..f329623703 100644
--- a/osu.Game.Tournament.Tests/TestSceneDrawableTournamentMatch.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs
@@ -10,14 +10,13 @@ using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder.Components;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Components
 {
     public class TestSceneDrawableTournamentMatch : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(TournamentMatch),
-            typeof(DrawableTournamentMatch),
             typeof(DrawableTournamentTeam),
         };
 
diff --git a/osu.Game.Tournament.Tests/TestSceneMatchScoreDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs
similarity index 96%
rename from osu.Game.Tournament.Tests/TestSceneMatchScoreDisplay.cs
rename to osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs
index 7e9b83a61b..72d9eb0e07 100644
--- a/osu.Game.Tournament.Tests/TestSceneMatchScoreDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs
@@ -7,7 +7,7 @@ using osu.Framework.MathUtils;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Screens.Gameplay.Components;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Components
 {
     public class TestSceneMatchScoreDisplay : LadderTestScene
     {
diff --git a/osu.Game.Tournament.Tests/TestSceneBeatmapPanel.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs
similarity index 80%
rename from osu.Game.Tournament.Tests/TestSceneBeatmapPanel.cs
rename to osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs
index 50169adad3..77fa411058 100644
--- a/osu.Game.Tournament.Tests/TestSceneBeatmapPanel.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
@@ -13,9 +11,9 @@ using osu.Game.Rulesets;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Components
 {
-    public class TestSceneBeatmapPanel : OsuTestScene
+    public class TestSceneTournamentBeatmapPanel : OsuTestScene
     {
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -23,11 +21,6 @@ namespace osu.Game.Tournament.Tests
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(TournamentBeatmapPanel),
-        };
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Tournament.Tests/TestSceneTournamentMatchChatDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
similarity index 98%
rename from osu.Game.Tournament.Tests/TestSceneTournamentMatchChatDisplay.cs
rename to osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
index 829d8629e5..41d32d9448 100644
--- a/osu.Game.Tournament.Tests/TestSceneTournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentMatchChatDisplay.cs
@@ -11,7 +11,7 @@ using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Components
 {
     public class TestSceneTournamentMatchChatDisplay : OsuTestScene
     {
diff --git a/osu.Game.Tournament.Tests/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
similarity index 93%
rename from osu.Game.Tournament.Tests/TestSceneGameplayScreen.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index 74d8615db0..201736f38a 100644
--- a/osu.Game.Tournament.Tests/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -6,7 +6,7 @@ using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Screens.Gameplay;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Screens
 {
     public class TestSceneGameplayScreen : OsuTestScene
     {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
new file mode 100644
index 0000000000..a45c5de2bd
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Cursor;
+using osu.Game.Tournament.Screens.Editors;
+
+namespace osu.Game.Tournament.Tests.Screens
+{
+    public class TestSceneLadderEditorScreen : LadderTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Add(new OsuContextMenuContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new LadderEditorScreen()
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tournament.Tests/TestSceneLadderManager.cs b/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
similarity index 84%
rename from osu.Game.Tournament.Tests/TestSceneLadderManager.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
index c9ea740f92..2be0564c82 100644
--- a/osu.Game.Tournament.Tests/TestSceneLadderManager.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneLadderScreen.cs
@@ -6,9 +6,9 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Tournament.Screens.Ladder;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneLadderManager : LadderTestScene
+    public class TestSceneLadderScreen : LadderTestScene
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tournament.Tests/TestSceneMapPool.cs b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
similarity index 84%
rename from osu.Game.Tournament.Tests/TestSceneMapPool.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
index 43f4831a2a..a7011c6d3c 100644
--- a/osu.Game.Tournament.Tests/TestSceneMapPool.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
@@ -6,9 +6,9 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Tournament.Screens.MapPool;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneMapPool : LadderTestScene
+    public class TestSceneMapPoolScreen : LadderTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
diff --git a/osu.Game.Tournament.Tests/TestSceneRoundEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
similarity index 89%
rename from osu.Game.Tournament.Tests/TestSceneRoundEditorScreen.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
index 9c1207a718..6203d68e80 100644
--- a/osu.Game.Tournament.Tests/TestSceneRoundEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneRoundEditorScreen.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Tournament.Screens.Editors;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Screens
 {
     public class TestSceneRoundEditorScreen : LadderTestScene
     {
diff --git a/osu.Game.Tournament.Tests/TestSceneSchedule.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
similarity index 60%
rename from osu.Game.Tournament.Tests/TestSceneSchedule.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index 00eb4c4e41..f3e65919eb 100644
--- a/osu.Game.Tournament.Tests/TestSceneSchedule.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
@@ -1,21 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Screens.Schedule;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneSchedule : OsuTestScene
+    public class TestSceneScheduleScreen : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ScheduleScreen)
-        };
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Tournament.Tests/TestSceneShowcase.cs b/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
similarity index 60%
rename from osu.Game.Tournament.Tests/TestSceneShowcase.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
index a4d518eedd..edf1477b06 100644
--- a/osu.Game.Tournament.Tests/TestSceneShowcase.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs
@@ -1,21 +1,14 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Screens.Showcase;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneShowcase : OsuTestScene
+    public class TestSceneShowcaseScreen : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(ShowcaseScreen)
-        };
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Tournament.Tests/TestSceneTeamEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
similarity index 89%
rename from osu.Game.Tournament.Tests/TestSceneTeamEditorScreen.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
index df0b79d8a9..126e0c2fda 100644
--- a/osu.Game.Tournament.Tests/TestSceneTeamEditorScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamEditorScreen.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Tournament.Screens.Editors;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Screens
 {
     public class TestSceneTeamEditorScreen : LadderTestScene
     {
diff --git a/osu.Game.Tournament.Tests/TestSceneTeamIntro.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
similarity index 91%
rename from osu.Game.Tournament.Tests/TestSceneTeamIntro.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
index 6b31fd2742..3d340e393c 100644
--- a/osu.Game.Tournament.Tests/TestSceneTeamIntro.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamIntroScreen.cs
@@ -8,9 +8,9 @@ using osu.Framework.Graphics;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.TeamIntro;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneTeamIntro : LadderTestScene
+    public class TestSceneTeamIntroScreen : LadderTestScene
     {
         [Cached]
         private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
diff --git a/osu.Game.Tournament.Tests/TestSceneTeamWin.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
similarity index 91%
rename from osu.Game.Tournament.Tests/TestSceneTeamWin.cs
rename to osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index d195ad42ca..6f5e17a36e 100644
--- a/osu.Game.Tournament.Tests/TestSceneTeamWin.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -8,9 +8,9 @@ using osu.Framework.Graphics;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.TeamWin;
 
-namespace osu.Game.Tournament.Tests
+namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneTeamWin : LadderTestScene
+    public class TestSceneTeamWinScreen : LadderTestScene
     {
         [Cached]
         private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
diff --git a/osu.Game.Tournament.Tests/TestSceneSceneManager.cs b/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs
similarity index 87%
rename from osu.Game.Tournament.Tests/TestSceneSceneManager.cs
rename to osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs
index aa333e39b1..378614343a 100644
--- a/osu.Game.Tournament.Tests/TestSceneSceneManager.cs
+++ b/osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs
@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tournament.Tests
 {
-    public class TestSceneSceneManager : OsuTestScene
+    public class TestSceneTournamentSceneManager : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load(Storage storage)
diff --git a/osu.Game.Tournament/osu.Game.Tournament.csproj b/osu.Game.Tournament/osu.Game.Tournament.csproj
index 8412166250..8adff80820 100644
--- a/osu.Game.Tournament/osu.Game.Tournament.csproj
+++ b/osu.Game.Tournament/osu.Game.Tournament.csproj
@@ -10,7 +10,4 @@
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Screens\Rounds" />
-  </ItemGroup>
 </Project>
\ No newline at end of file