diff --git a/core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml b/core/modules/editor/tests/modules/editor_private_test/config/install/editor.editor.private_images.yml
similarity index 100%
rename from core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml
rename to core/modules/editor/tests/modules/editor_private_test/config/install/editor.editor.private_images.yml
diff --git a/core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml b/core/modules/editor/tests/modules/editor_private_test/config/install/filter.format.private_images.yml
similarity index 100%
rename from core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml
rename to core/modules/editor/tests/modules/editor_private_test/config/install/filter.format.private_images.yml
diff --git a/core/modules/editor/tests/editor_private_test/editor_private_test.info.yml b/core/modules/editor/tests/modules/editor_private_test/editor_private_test.info.yml
similarity index 100%
rename from core/modules/editor/tests/editor_private_test/editor_private_test.info.yml
rename to core/modules/editor/tests/modules/editor_private_test/editor_private_test.info.yml
diff --git a/core/modules/editor/tests/modules/config/schema/editor_test.schema.yml b/core/modules/editor/tests/modules/editor_test/config/schema/editor_test.schema.yml
similarity index 100%
rename from core/modules/editor/tests/modules/config/schema/editor_test.schema.yml
rename to core/modules/editor/tests/modules/editor_test/config/schema/editor_test.schema.yml
diff --git a/core/modules/editor/tests/modules/editor_test.info.yml b/core/modules/editor/tests/modules/editor_test/editor_test.info.yml
similarity index 100%
rename from core/modules/editor/tests/modules/editor_test.info.yml
rename to core/modules/editor/tests/modules/editor_test/editor_test.info.yml
diff --git a/core/modules/editor/tests/modules/editor_test.libraries.yml b/core/modules/editor/tests/modules/editor_test/editor_test.libraries.yml
similarity index 100%
rename from core/modules/editor/tests/modules/editor_test.libraries.yml
rename to core/modules/editor/tests/modules/editor_test/editor_test.libraries.yml
diff --git a/core/modules/editor/tests/modules/editor_test.module b/core/modules/editor/tests/modules/editor_test/editor_test.module
similarity index 100%
rename from core/modules/editor/tests/modules/editor_test.module
rename to core/modules/editor/tests/modules/editor_test/editor_test.module
diff --git a/core/modules/editor/tests/modules/src/EditorXssFilter/Insecure.php b/core/modules/editor/tests/modules/editor_test/src/EditorXssFilter/Insecure.php
similarity index 100%
rename from core/modules/editor/tests/modules/src/EditorXssFilter/Insecure.php
rename to core/modules/editor/tests/modules/editor_test/src/EditorXssFilter/Insecure.php
diff --git a/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php b/core/modules/editor/tests/modules/editor_test/src/Plugin/Editor/TRexEditor.php
similarity index 100%
rename from core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
rename to core/modules/editor/tests/modules/editor_test/src/Plugin/Editor/TRexEditor.php
diff --git a/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php b/core/modules/editor/tests/modules/editor_test/src/Plugin/Editor/UnicornEditor.php
similarity index 100%
rename from core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
rename to core/modules/editor/tests/modules/editor_test/src/Plugin/Editor/UnicornEditor.php
diff --git a/core/modules/editor/tests/modules/src/Plugin/Field/FieldType/EditorTestTextLongItem.php b/core/modules/editor/tests/modules/editor_test/src/Plugin/Field/FieldType/EditorTestTextLongItem.php
similarity index 100%
rename from core/modules/editor/tests/modules/src/Plugin/Field/FieldType/EditorTestTextLongItem.php
rename to core/modules/editor/tests/modules/editor_test/src/Plugin/Field/FieldType/EditorTestTextLongItem.php