diff --git a/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
similarity index 98%
rename from osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
rename to osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
index 9613f250c4..feda1ae0e9 100644
--- a/osu.Game.Tests/Editor/EditorChangeHandlerTest.cs
+++ b/osu.Game.Tests/Editing/EditorChangeHandlerTest.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Edit;
 
-namespace osu.Game.Tests.Editor
+namespace osu.Game.Tests.Editing
 {
     [TestFixture]
     public class EditorChangeHandlerTest
diff --git a/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
similarity index 99%
rename from osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
rename to osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
index c24418d688..a3ab677d96 100644
--- a/osu.Game.Tests/Editor/LegacyEditorBeatmapPatcherTest.cs
+++ b/osu.Game.Tests/Editing/LegacyEditorBeatmapPatcherTest.cs
@@ -17,7 +17,7 @@ using osu.Game.Screens.Edit;
 using osuTK;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
-namespace osu.Game.Tests.Editor
+namespace osu.Game.Tests.Editing
 {
     [TestFixture]
     public class LegacyEditorBeatmapPatcherTest
diff --git a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
similarity index 99%
rename from osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
rename to osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index 3cb5909ba9..168ec0f09d 100644
--- a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Screens.Edit;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Tests.Editor
+namespace osu.Game.Tests.Editing
 {
     [HeadlessTest]
     public class TestSceneHitObjectComposerDistanceSnapping : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
index fd7a5980f3..f6e69fd8bf 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBeatDivisorControl.cs
@@ -14,7 +14,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneBeatDivisorControl : OsuManualInputManagerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeScreen.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneComposeScreen.cs
index a8830824c0..6f5655006e 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeScreen.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneComposeScreen : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index f49256a633..417d16fdb0 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneDistanceSnapGrid : EditorClockTestScene
     {
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
index efc2a6f552..d85bf15d52 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorChangeStates.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneEditorChangeStates : ScreenTestScene
     {
@@ -162,7 +162,7 @@ namespace osu.Game.Tests.Visual.Editor
 
         private void addRedoSteps() => AddStep("redo", () => editor.Redo());
 
-        private class TestEditor : Screens.Edit.Editor
+        private class TestEditor : Editor
         {
             public new void Undo() => base.Undo();
 
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
index 1709067d5d..2deeaef1f6 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorComposeRadioButtons.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Components.RadioButtons;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorComposeRadioButtons : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
index 53c2d62067..2cbdacb61c 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorMenuBar.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Components.Menus;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorMenuBar : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
index 3118e0cabe..41d1459103 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorSeekSnapping : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index 2e04eb50ca..c92423545d 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorSummaryTimeline : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
index e41c2427fb..ddaca26220 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectComposer.cs
@@ -20,7 +20,7 @@ using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneHitObjectComposer : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs b/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs
rename to osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
index 0d4fe4366d..3af976cae0 100644
--- a/osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs
+++ b/osu.Game.Tests/Visual/Editing/TestScenePlaybackControl.cs
@@ -9,7 +9,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Screens.Edit.Components;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestScenePlaybackControl : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
index 4d8f877575..5ab2f49b4a 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineBlueprintContainer.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneTimelineBlueprintContainer : TimelineTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
index 43a3cd6122..e33040acdc 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineTickDisplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineTickDisplay.cs
@@ -8,7 +8,7 @@ using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneTimelineTickDisplay : TimelineTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
index ae09a7fa47..a6dbe9571e 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimingScreen.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Timing;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneTimingScreen : EditorClockTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs b/osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
index e2762f3d5f..0c1296b82c 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneWaveform.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneWaveform : OsuTestScene
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
index 19d19c2759..082268d824 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
@@ -15,7 +15,7 @@ using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneZoomableScrollContainer : OsuManualInputManagerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
rename to osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 7081eb3af5..56b2860e96 100644
--- a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -18,7 +18,7 @@ using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     public abstract class TimelineTestScene : EditorClockTestScene
     {