diff --git a/core/modules/config/tests/modules/config_collection_clash_install_test/config/install/another_collection/config_collection_install_test.test.yml b/core/modules/config/tests/config_collection_clash_install_test/config/install/another_collection/config_collection_install_test.test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_clash_install_test/config/install/another_collection/config_collection_install_test.test.yml
rename to core/modules/config/tests/config_collection_clash_install_test/config/install/another_collection/config_collection_install_test.test.yml
diff --git a/core/modules/config/tests/modules/config_collection_clash_install_test/config/install/collection/test1/config_collection_install_test.test.yml b/core/modules/config/tests/config_collection_clash_install_test/config/install/collection/test1/config_collection_install_test.test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_clash_install_test/config/install/collection/test1/config_collection_install_test.test.yml
rename to core/modules/config/tests/config_collection_clash_install_test/config/install/collection/test1/config_collection_install_test.test.yml
diff --git a/core/modules/config/tests/modules/config_collection_clash_install_test/config/install/collection/test2/config_collection_install_test.test.yml b/core/modules/config/tests/config_collection_clash_install_test/config/install/collection/test2/config_collection_install_test.test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_clash_install_test/config/install/collection/test2/config_collection_install_test.test.yml
rename to core/modules/config/tests/config_collection_clash_install_test/config/install/collection/test2/config_collection_install_test.test.yml
diff --git a/core/modules/config/tests/modules/config_collection_clash_install_test/config/install/entity/config_test.dynamic.dotted.default.yml b/core/modules/config/tests/config_collection_clash_install_test/config/install/entity/config_test.dynamic.dotted.default.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_clash_install_test/config/install/entity/config_test.dynamic.dotted.default.yml
rename to core/modules/config/tests/config_collection_clash_install_test/config/install/entity/config_test.dynamic.dotted.default.yml
diff --git a/core/modules/config/tests/modules/config_collection_clash_install_test/config_collection_clash_install_test.info.yml b/core/modules/config/tests/config_collection_clash_install_test/config_collection_clash_install_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_clash_install_test/config_collection_clash_install_test.info.yml
rename to core/modules/config/tests/config_collection_clash_install_test/config_collection_clash_install_test.info.yml
diff --git a/core/modules/config/tests/modules/config_collection_install_test/config/install/another_collection/config_collection_install_test.test.yml b/core/modules/config/tests/config_collection_install_test/config/install/another_collection/config_collection_install_test.test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_install_test/config/install/another_collection/config_collection_install_test.test.yml
rename to core/modules/config/tests/config_collection_install_test/config/install/another_collection/config_collection_install_test.test.yml
diff --git a/core/modules/config/tests/modules/config_collection_install_test/config/install/collection/test1/config_collection_install_test.test.yml b/core/modules/config/tests/config_collection_install_test/config/install/collection/test1/config_collection_install_test.test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_install_test/config/install/collection/test1/config_collection_install_test.test.yml
rename to core/modules/config/tests/config_collection_install_test/config/install/collection/test1/config_collection_install_test.test.yml
diff --git a/core/modules/config/tests/modules/config_collection_install_test/config/install/collection/test2/config_collection_install_test.test.yml b/core/modules/config/tests/config_collection_install_test/config/install/collection/test2/config_collection_install_test.test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_install_test/config/install/collection/test2/config_collection_install_test.test.yml
rename to core/modules/config/tests/config_collection_install_test/config/install/collection/test2/config_collection_install_test.test.yml
diff --git a/core/modules/config/tests/modules/config_collection_install_test/config/install/entity/config_test.dynamic.dotted.default.yml b/core/modules/config/tests/config_collection_install_test/config/install/entity/config_test.dynamic.dotted.default.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_install_test/config/install/entity/config_test.dynamic.dotted.default.yml
rename to core/modules/config/tests/config_collection_install_test/config/install/entity/config_test.dynamic.dotted.default.yml
diff --git a/core/modules/config/tests/modules/config_collection_install_test/config/schema/config_collection_install_test.schema.yml b/core/modules/config/tests/config_collection_install_test/config/schema/config_collection_install_test.schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_install_test/config/schema/config_collection_install_test.schema.yml
rename to core/modules/config/tests/config_collection_install_test/config/schema/config_collection_install_test.schema.yml
diff --git a/core/modules/config/tests/modules/config_collection_install_test/config_collection_install_test.info.yml b/core/modules/config/tests/config_collection_install_test/config_collection_install_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_install_test/config_collection_install_test.info.yml
rename to core/modules/config/tests/config_collection_install_test/config_collection_install_test.info.yml
diff --git a/core/modules/config/tests/modules/config_collection_install_test/config_collection_install_test.services.yml b/core/modules/config/tests/config_collection_install_test/config_collection_install_test.services.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_install_test/config_collection_install_test.services.yml
rename to core/modules/config/tests/config_collection_install_test/config_collection_install_test.services.yml
diff --git a/core/modules/config/tests/modules/config_collection_install_test/src/EventSubscriber.php b/core/modules/config/tests/config_collection_install_test/src/EventSubscriber.php
similarity index 100%
rename from core/modules/config/tests/modules/config_collection_install_test/src/EventSubscriber.php
rename to core/modules/config/tests/config_collection_install_test/src/EventSubscriber.php
diff --git a/core/modules/config/tests/modules/config_entity_static_cache_test/config_entity_static_cache_test.info.yml b/core/modules/config/tests/config_entity_static_cache_test/config_entity_static_cache_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_entity_static_cache_test/config_entity_static_cache_test.info.yml
rename to core/modules/config/tests/config_entity_static_cache_test/config_entity_static_cache_test.info.yml
diff --git a/core/modules/config/tests/modules/config_entity_static_cache_test/config_entity_static_cache_test.module b/core/modules/config/tests/config_entity_static_cache_test/config_entity_static_cache_test.module
similarity index 100%
rename from core/modules/config/tests/modules/config_entity_static_cache_test/config_entity_static_cache_test.module
rename to core/modules/config/tests/config_entity_static_cache_test/config_entity_static_cache_test.module
diff --git a/core/modules/config/tests/modules/config_entity_static_cache_test/src/ConfigOverrider.php b/core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php
similarity index 100%
rename from core/modules/config/tests/modules/config_entity_static_cache_test/src/ConfigOverrider.php
rename to core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php
diff --git a/core/modules/config/tests/modules/config_events_test/config/schema/config_events_test.schema.yml b/core/modules/config/tests/config_events_test/config/schema/config_events_test.schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_events_test/config/schema/config_events_test.schema.yml
rename to core/modules/config/tests/config_events_test/config/schema/config_events_test.schema.yml
diff --git a/core/modules/config/tests/modules/config_events_test/config_events_test.info.yml b/core/modules/config/tests/config_events_test/config_events_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_events_test/config_events_test.info.yml
rename to core/modules/config/tests/config_events_test/config_events_test.info.yml
diff --git a/core/modules/config/tests/modules/config_events_test/config_events_test.services.yml b/core/modules/config/tests/config_events_test/config_events_test.services.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_events_test/config_events_test.services.yml
rename to core/modules/config/tests/config_events_test/config_events_test.services.yml
diff --git a/core/modules/config/tests/modules/config_events_test/src/EventSubscriber.php b/core/modules/config/tests/config_events_test/src/EventSubscriber.php
similarity index 100%
rename from core/modules/config/tests/modules/config_events_test/src/EventSubscriber.php
rename to core/modules/config/tests/config_events_test/src/EventSubscriber.php
diff --git a/core/modules/config/tests/modules/config_exclude_test/config/install/system.menu.exclude-test.yml b/core/modules/config/tests/config_exclude_test/config/install/system.menu.exclude-test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_exclude_test/config/install/system.menu.exclude-test.yml
rename to core/modules/config/tests/config_exclude_test/config/install/system.menu.exclude-test.yml
diff --git a/core/modules/config/tests/modules/config_exclude_test/config/install/system.menu.indirect-exclude-test.yml b/core/modules/config/tests/config_exclude_test/config/install/system.menu.indirect-exclude-test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_exclude_test/config/install/system.menu.indirect-exclude-test.yml
rename to core/modules/config/tests/config_exclude_test/config/install/system.menu.indirect-exclude-test.yml
diff --git a/core/modules/config/tests/modules/config_exclude_test/config_exclude_test.info.yml b/core/modules/config/tests/config_exclude_test/config_exclude_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_exclude_test/config_exclude_test.info.yml
rename to core/modules/config/tests/config_exclude_test/config_exclude_test.info.yml
diff --git a/core/modules/config/tests/modules/config_import_test/config_import_test.info.yml b/core/modules/config/tests/config_import_test/config_import_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_import_test/config_import_test.info.yml
rename to core/modules/config/tests/config_import_test/config_import_test.info.yml
diff --git a/core/modules/config/tests/modules/config_import_test/config_import_test.module b/core/modules/config/tests/config_import_test/config_import_test.module
similarity index 100%
rename from core/modules/config/tests/modules/config_import_test/config_import_test.module
rename to core/modules/config/tests/config_import_test/config_import_test.module
diff --git a/core/modules/config/tests/modules/config_import_test/config_import_test.services.yml b/core/modules/config/tests/config_import_test/config_import_test.services.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_import_test/config_import_test.services.yml
rename to core/modules/config/tests/config_import_test/config_import_test.services.yml
diff --git a/core/modules/config/tests/modules/config_import_test/src/EventSubscriber.php b/core/modules/config/tests/config_import_test/src/EventSubscriber.php
similarity index 100%
rename from core/modules/config/tests/modules/config_import_test/src/EventSubscriber.php
rename to core/modules/config/tests/config_import_test/src/EventSubscriber.php
diff --git a/core/modules/config/tests/modules/config_install_dependency_enforced_combo_test/config/optional/config_test.dynamic.enforced_and_base_dependencies.yml b/core/modules/config/tests/config_install_dependency_enforced_combo_test/config/optional/config_test.dynamic.enforced_and_base_dependencies.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_dependency_enforced_combo_test/config/optional/config_test.dynamic.enforced_and_base_dependencies.yml
rename to core/modules/config/tests/config_install_dependency_enforced_combo_test/config/optional/config_test.dynamic.enforced_and_base_dependencies.yml
diff --git a/core/modules/config/tests/modules/config_install_dependency_enforced_combo_test/config_install_dependency_enforced_combo_test.info.yml b/core/modules/config/tests/config_install_dependency_enforced_combo_test/config_install_dependency_enforced_combo_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_dependency_enforced_combo_test/config_install_dependency_enforced_combo_test.info.yml
rename to core/modules/config/tests/config_install_dependency_enforced_combo_test/config_install_dependency_enforced_combo_test.info.yml
diff --git a/core/modules/config/tests/modules/config_install_dependency_test/config/install/config_other_module_config_test.weird_simple_config.yml b/core/modules/config/tests/config_install_dependency_test/config/install/config_other_module_config_test.weird_simple_config.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_dependency_test/config/install/config_other_module_config_test.weird_simple_config.yml
rename to core/modules/config/tests/config_install_dependency_test/config/install/config_other_module_config_test.weird_simple_config.yml
diff --git a/core/modules/config/tests/modules/config_install_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml b/core/modules/config/tests/config_install_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml
rename to core/modules/config/tests/config_install_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml
diff --git a/core/modules/config/tests/modules/config_install_dependency_test/config/optional/config_test.dynamic.dependency_for_unmet2.yml b/core/modules/config/tests/config_install_dependency_test/config/optional/config_test.dynamic.dependency_for_unmet2.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_dependency_test/config/optional/config_test.dynamic.dependency_for_unmet2.yml
rename to core/modules/config/tests/config_install_dependency_test/config/optional/config_test.dynamic.dependency_for_unmet2.yml
diff --git a/core/modules/config/tests/modules/config_install_dependency_test/config_install_dependency_test.info.yml b/core/modules/config/tests/config_install_dependency_test/config_install_dependency_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_dependency_test/config_install_dependency_test.info.yml
rename to core/modules/config/tests/config_install_dependency_test/config_install_dependency_test.info.yml
diff --git a/core/modules/config/tests/modules/config_install_dependency_test/config_install_dependency_test.module b/core/modules/config/tests/config_install_dependency_test/config_install_dependency_test.module
similarity index 100%
rename from core/modules/config/tests/modules/config_install_dependency_test/config_install_dependency_test.module
rename to core/modules/config/tests/config_install_dependency_test/config_install_dependency_test.module
diff --git a/core/modules/config/tests/modules/config_install_double_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml b/core/modules/config/tests/config_install_double_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_double_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml
rename to core/modules/config/tests/config_install_double_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml
diff --git a/core/modules/config/tests/modules/config_install_double_dependency_test/config/install/config_test.dynamic.yet_another_module_test_with_dependency.yml b/core/modules/config/tests/config_install_double_dependency_test/config/install/config_test.dynamic.yet_another_module_test_with_dependency.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_double_dependency_test/config/install/config_test.dynamic.yet_another_module_test_with_dependency.yml
rename to core/modules/config/tests/config_install_double_dependency_test/config/install/config_test.dynamic.yet_another_module_test_with_dependency.yml
diff --git a/core/modules/config/tests/modules/config_install_double_dependency_test/config_install_double_dependency_test.info.yml b/core/modules/config/tests/config_install_double_dependency_test/config_install_double_dependency_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_double_dependency_test/config_install_double_dependency_test.info.yml
rename to core/modules/config/tests/config_install_double_dependency_test/config_install_double_dependency_test.info.yml
diff --git a/core/modules/config/tests/modules/config_install_fail_test/config/install/config_test.dynamic.dotted.default.yml b/core/modules/config/tests/config_install_fail_test/config/install/config_test.dynamic.dotted.default.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_fail_test/config/install/config_test.dynamic.dotted.default.yml
rename to core/modules/config/tests/config_install_fail_test/config/install/config_test.dynamic.dotted.default.yml
diff --git a/core/modules/config/tests/modules/config_install_fail_test/config/install/language/fr/config_test.dynamic.dotted.default.yml b/core/modules/config/tests/config_install_fail_test/config/install/language/fr/config_test.dynamic.dotted.default.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_fail_test/config/install/language/fr/config_test.dynamic.dotted.default.yml
rename to core/modules/config/tests/config_install_fail_test/config/install/language/fr/config_test.dynamic.dotted.default.yml
diff --git a/core/modules/config/tests/modules/config_install_fail_test/config_install_fail_test.info.yml b/core/modules/config/tests/config_install_fail_test/config_install_fail_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_install_fail_test/config_install_fail_test.info.yml
rename to core/modules/config/tests/config_install_fail_test/config_install_fail_test.info.yml
diff --git a/core/modules/config/tests/modules/config_integration_test/config/install/config_integration_test.settings.yml b/core/modules/config/tests/config_integration_test/config/install/config_integration_test.settings.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_integration_test/config/install/config_integration_test.settings.yml
rename to core/modules/config/tests/config_integration_test/config/install/config_integration_test.settings.yml
diff --git a/core/modules/config/tests/modules/config_integration_test/config/install/config_test.dynamic.config_integration_test.yml b/core/modules/config/tests/config_integration_test/config/install/config_test.dynamic.config_integration_test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_integration_test/config/install/config_test.dynamic.config_integration_test.yml
rename to core/modules/config/tests/config_integration_test/config/install/config_test.dynamic.config_integration_test.yml
diff --git a/core/modules/config/tests/modules/config_integration_test/config/schema/config_integration_test.schema.yml b/core/modules/config/tests/config_integration_test/config/schema/config_integration_test.schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_integration_test/config/schema/config_integration_test.schema.yml
rename to core/modules/config/tests/config_integration_test/config/schema/config_integration_test.schema.yml
diff --git a/core/modules/config/tests/modules/config_integration_test/config_integration_test.info.yml b/core/modules/config/tests/config_integration_test/config_integration_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_integration_test/config_integration_test.info.yml
rename to core/modules/config/tests/config_integration_test/config_integration_test.info.yml
diff --git a/core/modules/config/tests/modules/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test.yml b/core/modules/config/tests/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test.yml
rename to core/modules/config/tests/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test.yml
diff --git a/core/modules/config/tests/modules/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_optional_entity_unmet.yml b/core/modules/config/tests/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_optional_entity_unmet.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_optional_entity_unmet.yml
rename to core/modules/config/tests/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_optional_entity_unmet.yml
diff --git a/core/modules/config/tests/modules/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_optional_entity_unmet2.yml b/core/modules/config/tests/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_optional_entity_unmet2.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_optional_entity_unmet2.yml
rename to core/modules/config/tests/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_optional_entity_unmet2.yml
diff --git a/core/modules/config/tests/modules/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_unmet.yml b/core/modules/config/tests/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_unmet.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_unmet.yml
rename to core/modules/config/tests/config_other_module_config_test/config/optional/config_test.dynamic.other_module_test_unmet.yml
diff --git a/core/modules/config/tests/modules/config_other_module_config_test/config/schema/config_other_module_config_test.schema.yml b/core/modules/config/tests/config_other_module_config_test/config/schema/config_other_module_config_test.schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_other_module_config_test/config/schema/config_other_module_config_test.schema.yml
rename to core/modules/config/tests/config_other_module_config_test/config/schema/config_other_module_config_test.schema.yml
diff --git a/core/modules/config/tests/modules/config_other_module_config_test/config_other_module_config_test.info.yml b/core/modules/config/tests/config_other_module_config_test/config_other_module_config_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_other_module_config_test/config_other_module_config_test.info.yml
rename to core/modules/config/tests/config_other_module_config_test/config_other_module_config_test.info.yml
diff --git a/core/modules/config/tests/modules/config_override_integration_test/config/install/block.block.config_override_test.yml b/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_override_integration_test/config/install/block.block.config_override_test.yml
rename to core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml
diff --git a/core/modules/config/tests/modules/config_override_integration_test/config_override_integration_test.info.yml b/core/modules/config/tests/config_override_integration_test/config_override_integration_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_override_integration_test/config_override_integration_test.info.yml
rename to core/modules/config/tests/config_override_integration_test/config_override_integration_test.info.yml
diff --git a/core/modules/config/tests/modules/config_override_integration_test/config_override_integration_test.services.yml b/core/modules/config/tests/config_override_integration_test/config_override_integration_test.services.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_override_integration_test/config_override_integration_test.services.yml
rename to core/modules/config/tests/config_override_integration_test/config_override_integration_test.services.yml
diff --git a/core/modules/config/tests/modules/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php b/core/modules/config/tests/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php
similarity index 100%
rename from core/modules/config/tests/modules/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php
rename to core/modules/config/tests/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php
diff --git a/core/modules/config/tests/modules/config_override_integration_test/src/CacheabilityMetadataConfigOverride.php b/core/modules/config/tests/config_override_integration_test/src/CacheabilityMetadataConfigOverride.php
similarity index 100%
rename from core/modules/config/tests/modules/config_override_integration_test/src/CacheabilityMetadataConfigOverride.php
rename to core/modules/config/tests/config_override_integration_test/src/CacheabilityMetadataConfigOverride.php
diff --git a/core/modules/config/tests/modules/config_override_test/config/install/block.block.call_to_action.yml b/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_override_test/config/install/block.block.call_to_action.yml
rename to core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml
diff --git a/core/modules/config/tests/modules/config_override_test/config/install/system.cron.yml b/core/modules/config/tests/config_override_test/config/install/system.cron.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_override_test/config/install/system.cron.yml
rename to core/modules/config/tests/config_override_test/config/install/system.cron.yml
diff --git a/core/modules/config/tests/modules/config_override_test/config_override_test.info.yml b/core/modules/config/tests/config_override_test/config_override_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_override_test/config_override_test.info.yml
rename to core/modules/config/tests/config_override_test/config_override_test.info.yml
diff --git a/core/modules/config/tests/modules/config_override_test/config_override_test.services.yml b/core/modules/config/tests/config_override_test/config_override_test.services.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_override_test/config_override_test.services.yml
rename to core/modules/config/tests/config_override_test/config_override_test.services.yml
diff --git a/core/modules/config/tests/modules/config_override_test/src/Cache/PirateDayCacheContext.php b/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php
similarity index 100%
rename from core/modules/config/tests/modules/config_override_test/src/Cache/PirateDayCacheContext.php
rename to core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php
diff --git a/core/modules/config/tests/modules/config_override_test/src/ConfigOverrider.php b/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
similarity index 100%
rename from core/modules/config/tests/modules/config_override_test/src/ConfigOverrider.php
rename to core/modules/config/tests/config_override_test/src/ConfigOverrider.php
diff --git a/core/modules/config/tests/modules/config_override_test/src/ConfigOverriderLowPriority.php b/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php
similarity index 100%
rename from core/modules/config/tests/modules/config_override_test/src/ConfigOverriderLowPriority.php
rename to core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php
diff --git a/core/modules/config/tests/modules/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php b/core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php
similarity index 100%
rename from core/modules/config/tests/modules/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php
rename to core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php
diff --git a/core/modules/config/tests/modules/config_schema_add_fallback_type_test/config/schema/config_schema_add_fallback_type_test.schema.yml b/core/modules/config/tests/config_schema_add_fallback_type_test/config/schema/config_schema_add_fallback_type_test.schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_add_fallback_type_test/config/schema/config_schema_add_fallback_type_test.schema.yml
rename to core/modules/config/tests/config_schema_add_fallback_type_test/config/schema/config_schema_add_fallback_type_test.schema.yml
diff --git a/core/modules/config/tests/modules/config_schema_add_fallback_type_test/config_schema_add_fallback_type_test.info.yml b/core/modules/config/tests/config_schema_add_fallback_type_test/config_schema_add_fallback_type_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_add_fallback_type_test/config_schema_add_fallback_type_test.info.yml
rename to core/modules/config/tests/config_schema_add_fallback_type_test/config_schema_add_fallback_type_test.info.yml
diff --git a/core/modules/config/tests/modules/config_schema_deprecated_test/config/schema/config_schema_deprecated_test.schema.yml b/core/modules/config/tests/config_schema_deprecated_test/config/schema/config_schema_deprecated_test.schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_deprecated_test/config/schema/config_schema_deprecated_test.schema.yml
rename to core/modules/config/tests/config_schema_deprecated_test/config/schema/config_schema_deprecated_test.schema.yml
diff --git a/core/modules/config/tests/modules/config_schema_deprecated_test/config_schema_deprecated_test.info.yml b/core/modules/config/tests/config_schema_deprecated_test/config_schema_deprecated_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_deprecated_test/config_schema_deprecated_test.info.yml
rename to core/modules/config/tests/config_schema_deprecated_test/config_schema_deprecated_test.info.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.ignore.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.ignore.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.ignore.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.ignore.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.no_schema.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.no_schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.no_schema.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.no_schema.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.plugin_types.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.plugin_types.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.plugin_types.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.plugin_types.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_one.subsection.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_one.subsection.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_one.subsection.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_one.subsection.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_two.subsection.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_two.subsection.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_two.subsection.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.some_module.section_two.subsection.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.some_schema.with_parents.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.with_parents.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.some_schema.with_parents.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.with_parents.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.some_schema.yml b/core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config/install/config_schema_test.some_schema.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_schema_test.some_schema.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config/install/config_test.dynamic.third_party.yml b/core/modules/config/tests/config_schema_test/config/install/config_test.dynamic.third_party.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config/install/config_test.dynamic.third_party.yml
rename to core/modules/config/tests/config_schema_test/config/install/config_test.dynamic.third_party.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config/schema/config_schema_test.schema.yml b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config/schema/config_schema_test.schema.yml
rename to core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config_schema_test.info.yml b/core/modules/config/tests/config_schema_test/config_schema_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config_schema_test.info.yml
rename to core/modules/config/tests/config_schema_test/config_schema_test.info.yml
diff --git a/core/modules/config/tests/modules/config_schema_test/config_schema_test.module b/core/modules/config/tests/config_schema_test/config_schema_test.module
similarity index 100%
rename from core/modules/config/tests/modules/config_schema_test/config_schema_test.module
rename to core/modules/config/tests/config_schema_test/config_schema_test.module
diff --git a/core/modules/config/tests/modules/config_test/config/install/config_test.dynamic.dotted.default.yml b/core/modules/config/tests/config_test/config/install/config_test.dynamic.dotted.default.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/install/config_test.dynamic.dotted.default.yml
rename to core/modules/config/tests/config_test/config/install/config_test.dynamic.dotted.default.yml
diff --git a/core/modules/config/tests/modules/config_test/config/install/config_test.dynamic.isinstallable.yml b/core/modules/config/tests/config_test/config/install/config_test.dynamic.isinstallable.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/install/config_test.dynamic.isinstallable.yml
rename to core/modules/config/tests/config_test/config/install/config_test.dynamic.isinstallable.yml
diff --git a/core/modules/config/tests/modules/config_test/config/install/config_test.no_status.default.yml b/core/modules/config/tests/config_test/config/install/config_test.no_status.default.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/install/config_test.no_status.default.yml
rename to core/modules/config/tests/config_test/config/install/config_test.no_status.default.yml
diff --git a/core/modules/config/tests/modules/config_test/config/install/config_test.system.yml b/core/modules/config/tests/config_test/config/install/config_test.system.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/install/config_test.system.yml
rename to core/modules/config/tests/config_test/config/install/config_test.system.yml
diff --git a/core/modules/config/tests/modules/config_test/config/install/config_test.types.yml b/core/modules/config/tests/config_test/config/install/config_test.types.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/install/config_test.types.yml
rename to core/modules/config/tests/config_test/config/install/config_test.types.yml
diff --git a/core/modules/config/tests/modules/config_test/config/install/config_test.validation.yml b/core/modules/config/tests/config_test/config/install/config_test.validation.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/install/config_test.validation.yml
rename to core/modules/config/tests/config_test/config/install/config_test.validation.yml
diff --git a/core/modules/config/tests/modules/config_test/config/install/language/de/config_test.system.yml b/core/modules/config/tests/config_test/config/install/language/de/config_test.system.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/install/language/de/config_test.system.yml
rename to core/modules/config/tests/config_test/config/install/language/de/config_test.system.yml
diff --git a/core/modules/config/tests/modules/config_test/config/install/language/en/config_test.system.yml b/core/modules/config/tests/config_test/config/install/language/en/config_test.system.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/install/language/en/config_test.system.yml
rename to core/modules/config/tests/config_test/config/install/language/en/config_test.system.yml
diff --git a/core/modules/config/tests/modules/config_test/config/install/language/fr/config_test.system.yml b/core/modules/config/tests/config_test/config/install/language/fr/config_test.system.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/install/language/fr/config_test.system.yml
rename to core/modules/config/tests/config_test/config/install/language/fr/config_test.system.yml
diff --git a/core/modules/config/tests/modules/config_test/config/optional/config_test.dynamic.override.yml b/core/modules/config/tests/config_test/config/optional/config_test.dynamic.override.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/optional/config_test.dynamic.override.yml
rename to core/modules/config/tests/config_test/config/optional/config_test.dynamic.override.yml
diff --git a/core/modules/config/tests/modules/config_test/config/optional/config_test.dynamic.override_unmet.yml b/core/modules/config/tests/config_test/config/optional/config_test.dynamic.override_unmet.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/optional/config_test.dynamic.override_unmet.yml
rename to core/modules/config/tests/config_test/config/optional/config_test.dynamic.override_unmet.yml
diff --git a/core/modules/config/tests/modules/config_test/config/schema/config_test.schema.yml b/core/modules/config/tests/config_test/config/schema/config_test.schema.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config/schema/config_test.schema.yml
rename to core/modules/config/tests/config_test/config/schema/config_test.schema.yml
diff --git a/core/modules/config/tests/modules/config_test/config_test.hooks.inc b/core/modules/config/tests/config_test/config_test.hooks.inc
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config_test.hooks.inc
rename to core/modules/config/tests/config_test/config_test.hooks.inc
diff --git a/core/modules/config/tests/modules/config_test/config_test.info.yml b/core/modules/config/tests/config_test/config_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config_test.info.yml
rename to core/modules/config/tests/config_test/config_test.info.yml
diff --git a/core/modules/config/tests/modules/config_test/config_test.install b/core/modules/config/tests/config_test/config_test.install
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config_test.install
rename to core/modules/config/tests/config_test/config_test.install
diff --git a/core/modules/config/tests/modules/config_test/config_test.links.action.yml b/core/modules/config/tests/config_test/config_test.links.action.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config_test.links.action.yml
rename to core/modules/config/tests/config_test/config_test.links.action.yml
diff --git a/core/modules/config/tests/modules/config_test/config_test.links.task.yml b/core/modules/config/tests/config_test/config_test.links.task.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config_test.links.task.yml
rename to core/modules/config/tests/config_test/config_test.links.task.yml
diff --git a/core/modules/config/tests/modules/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config_test.module
rename to core/modules/config/tests/config_test/config_test.module
diff --git a/core/modules/config/tests/modules/config_test/config_test.routing.yml b/core/modules/config/tests/config_test/config_test.routing.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test/config_test.routing.yml
rename to core/modules/config/tests/config_test/config_test.routing.yml
diff --git a/core/modules/config/tests/modules/config_test/src/ConfigTestAccessControlHandler.php b/core/modules/config/tests/config_test/src/ConfigTestAccessControlHandler.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/ConfigTestAccessControlHandler.php
rename to core/modules/config/tests/config_test/src/ConfigTestAccessControlHandler.php
diff --git a/core/modules/config/tests/modules/config_test/src/ConfigTestController.php b/core/modules/config/tests/config_test/src/ConfigTestController.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/ConfigTestController.php
rename to core/modules/config/tests/config_test/src/ConfigTestController.php
diff --git a/core/modules/config/tests/modules/config_test/src/ConfigTestForm.php b/core/modules/config/tests/config_test/src/ConfigTestForm.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/ConfigTestForm.php
rename to core/modules/config/tests/config_test/src/ConfigTestForm.php
diff --git a/core/modules/config/tests/modules/config_test/src/ConfigTestInterface.php b/core/modules/config/tests/config_test/src/ConfigTestInterface.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/ConfigTestInterface.php
rename to core/modules/config/tests/config_test/src/ConfigTestInterface.php
diff --git a/core/modules/config/tests/modules/config_test/src/ConfigTestListBuilder.php b/core/modules/config/tests/config_test/src/ConfigTestListBuilder.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/ConfigTestListBuilder.php
rename to core/modules/config/tests/config_test/src/ConfigTestListBuilder.php
diff --git a/core/modules/config/tests/modules/config_test/src/ConfigTestStorage.php b/core/modules/config/tests/config_test/src/ConfigTestStorage.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/ConfigTestStorage.php
rename to core/modules/config/tests/config_test/src/ConfigTestStorage.php
diff --git a/core/modules/config/tests/modules/config_test/src/ConfigValidation.php b/core/modules/config/tests/config_test/src/ConfigValidation.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/ConfigValidation.php
rename to core/modules/config/tests/config_test/src/ConfigValidation.php
diff --git a/core/modules/config/tests/modules/config_test/src/Entity/ConfigQueryTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/Entity/ConfigQueryTest.php
rename to core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
diff --git a/core/modules/config/tests/modules/config_test/src/Entity/ConfigTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/Entity/ConfigTest.php
rename to core/modules/config/tests/config_test/src/Entity/ConfigTest.php
diff --git a/core/modules/config/tests/modules/config_test/src/SchemaListenerController.php b/core/modules/config/tests/config_test/src/SchemaListenerController.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/SchemaListenerController.php
rename to core/modules/config/tests/config_test/src/SchemaListenerController.php
diff --git a/core/modules/config/tests/modules/config_test/src/TestInstallStorage.php b/core/modules/config/tests/config_test/src/TestInstallStorage.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/src/TestInstallStorage.php
rename to core/modules/config/tests/config_test/src/TestInstallStorage.php
diff --git a/core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestJsonAnonTest.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonAnonTest.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestJsonAnonTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonAnonTest.php
diff --git a/core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestJsonBasicAuthTest.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonBasicAuthTest.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestJsonBasicAuthTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonBasicAuthTest.php
diff --git a/core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestJsonCookieTest.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonCookieTest.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestJsonCookieTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestJsonCookieTest.php
diff --git a/core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
diff --git a/core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestXmlAnonTest.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlAnonTest.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestXmlAnonTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlAnonTest.php
diff --git a/core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestXmlBasicAuthTest.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlBasicAuthTest.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestXmlBasicAuthTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlBasicAuthTest.php
diff --git a/core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestXmlCookieTest.php b/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlCookieTest.php
similarity index 100%
rename from core/modules/config/tests/modules/config_test/tests/src/Functional/Rest/ConfigTestXmlCookieTest.php
rename to core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestXmlCookieTest.php
diff --git a/core/modules/config/tests/modules/config_test_id_mismatch/config/install/config_test.dynamic.no_id_match.yml b/core/modules/config/tests/config_test_id_mismatch/config/install/config_test.dynamic.no_id_match.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test_id_mismatch/config/install/config_test.dynamic.no_id_match.yml
rename to core/modules/config/tests/config_test_id_mismatch/config/install/config_test.dynamic.no_id_match.yml
diff --git a/core/modules/config/tests/modules/config_test_id_mismatch/config_test_id_mismatch.info.yml b/core/modules/config/tests/config_test_id_mismatch/config_test_id_mismatch.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test_id_mismatch/config_test_id_mismatch.info.yml
rename to core/modules/config/tests/config_test_id_mismatch/config_test_id_mismatch.info.yml
diff --git a/core/modules/config/tests/modules/config_test_language/config/install/config_test.dynamic.dotted.english.yml b/core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.english.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test_language/config/install/config_test.dynamic.dotted.english.yml
rename to core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.english.yml
diff --git a/core/modules/config/tests/modules/config_test_language/config/install/config_test.dynamic.dotted.french.yml b/core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.french.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test_language/config/install/config_test.dynamic.dotted.french.yml
rename to core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.french.yml
diff --git a/core/modules/config/tests/modules/config_test_language/config_test_language.info.yml b/core/modules/config/tests/config_test_language/config_test_language.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_test_language/config_test_language.info.yml
rename to core/modules/config/tests/config_test_language/config_test_language.info.yml
diff --git a/core/modules/config/tests/modules/config_transformer_test/config_transformer_test.info.yml b/core/modules/config/tests/config_transformer_test/config_transformer_test.info.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_transformer_test/config_transformer_test.info.yml
rename to core/modules/config/tests/config_transformer_test/config_transformer_test.info.yml
diff --git a/core/modules/config/tests/modules/config_transformer_test/config_transformer_test.services.yml b/core/modules/config/tests/config_transformer_test/config_transformer_test.services.yml
similarity index 100%
rename from core/modules/config/tests/modules/config_transformer_test/config_transformer_test.services.yml
rename to core/modules/config/tests/config_transformer_test/config_transformer_test.services.yml
diff --git a/core/modules/config/tests/modules/config_transformer_test/src/EventSubscriber.php b/core/modules/config/tests/config_transformer_test/src/EventSubscriber.php
similarity index 100%
rename from core/modules/config/tests/modules/config_transformer_test/src/EventSubscriber.php
rename to core/modules/config/tests/config_transformer_test/src/EventSubscriber.php
diff --git a/core/modules/dynamic_page_cache/tests/modules/dynamic_page_cache_test/dynamic_page_cache_test.info.yml b/core/modules/dynamic_page_cache/tests/dynamic_page_cache_test/dynamic_page_cache_test.info.yml
similarity index 100%
rename from core/modules/dynamic_page_cache/tests/modules/dynamic_page_cache_test/dynamic_page_cache_test.info.yml
rename to core/modules/dynamic_page_cache/tests/dynamic_page_cache_test/dynamic_page_cache_test.info.yml
diff --git a/core/modules/dynamic_page_cache/tests/modules/dynamic_page_cache_test/dynamic_page_cache_test.routing.yml b/core/modules/dynamic_page_cache/tests/dynamic_page_cache_test/dynamic_page_cache_test.routing.yml
similarity index 100%
rename from core/modules/dynamic_page_cache/tests/modules/dynamic_page_cache_test/dynamic_page_cache_test.routing.yml
rename to core/modules/dynamic_page_cache/tests/dynamic_page_cache_test/dynamic_page_cache_test.routing.yml
diff --git a/core/modules/dynamic_page_cache/tests/modules/dynamic_page_cache_test/src/DynamicPageCacheTestController.php b/core/modules/dynamic_page_cache/tests/dynamic_page_cache_test/src/DynamicPageCacheTestController.php
similarity index 100%
rename from core/modules/dynamic_page_cache/tests/modules/dynamic_page_cache_test/src/DynamicPageCacheTestController.php
rename to core/modules/dynamic_page_cache/tests/dynamic_page_cache_test/src/DynamicPageCacheTestController.php
diff --git a/core/modules/file/tests/modules/file_module_test/file_module_test.info.yml b/core/modules/file/tests/file_module_test/file_module_test.info.yml
similarity index 100%
rename from core/modules/file/tests/modules/file_module_test/file_module_test.info.yml
rename to core/modules/file/tests/file_module_test/file_module_test.info.yml
diff --git a/core/modules/file/tests/modules/file_module_test/file_module_test.routing.yml b/core/modules/file/tests/file_module_test/file_module_test.routing.yml
similarity index 100%
rename from core/modules/file/tests/modules/file_module_test/file_module_test.routing.yml
rename to core/modules/file/tests/file_module_test/file_module_test.routing.yml
diff --git a/core/modules/file/tests/modules/file_module_test/src/Form/FileModuleTestForm.php b/core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php
similarity index 100%
rename from core/modules/file/tests/modules/file_module_test/src/Form/FileModuleTestForm.php
rename to core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php
diff --git a/core/modules/file/tests/modules/file_test/file_test.info.yml b/core/modules/file/tests/file_test/file_test.info.yml
similarity index 100%
rename from core/modules/file/tests/modules/file_test/file_test.info.yml
rename to core/modules/file/tests/file_test/file_test.info.yml
diff --git a/core/modules/file/tests/modules/file_test/file_test.module b/core/modules/file/tests/file_test/file_test.module
similarity index 100%
rename from core/modules/file/tests/modules/file_test/file_test.module
rename to core/modules/file/tests/file_test/file_test.module
diff --git a/core/modules/file/tests/modules/file_test/file_test.routing.yml b/core/modules/file/tests/file_test/file_test.routing.yml
similarity index 100%
rename from core/modules/file/tests/modules/file_test/file_test.routing.yml
rename to core/modules/file/tests/file_test/file_test.routing.yml
diff --git a/core/modules/file/tests/modules/file_test/file_test.services.yml b/core/modules/file/tests/file_test/file_test.services.yml
similarity index 100%
rename from core/modules/file/tests/modules/file_test/file_test.services.yml
rename to core/modules/file/tests/file_test/file_test.services.yml
diff --git a/core/modules/file/tests/modules/file_test/src/FileTestAccessControlHandler.php b/core/modules/file/tests/file_test/src/FileTestAccessControlHandler.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/FileTestAccessControlHandler.php
rename to core/modules/file/tests/file_test/src/FileTestAccessControlHandler.php
diff --git a/core/modules/file/tests/modules/file_test/src/Form/FileRequiredTestForm.php b/core/modules/file/tests/file_test/src/Form/FileRequiredTestForm.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/Form/FileRequiredTestForm.php
rename to core/modules/file/tests/file_test/src/Form/FileRequiredTestForm.php
diff --git a/core/modules/file/tests/modules/file_test/src/Form/FileTestForm.php b/core/modules/file/tests/file_test/src/Form/FileTestForm.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/Form/FileTestForm.php
rename to core/modules/file/tests/file_test/src/Form/FileTestForm.php
diff --git a/core/modules/file/tests/modules/file_test/src/Form/FileTestSaveUploadFromForm.php b/core/modules/file/tests/file_test/src/Form/FileTestSaveUploadFromForm.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/Form/FileTestSaveUploadFromForm.php
rename to core/modules/file/tests/file_test/src/Form/FileTestSaveUploadFromForm.php
diff --git a/core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyExternalReadOnlyWrapper.php b/core/modules/file/tests/file_test/src/StreamWrapper/DummyExternalReadOnlyWrapper.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyExternalReadOnlyWrapper.php
rename to core/modules/file/tests/file_test/src/StreamWrapper/DummyExternalReadOnlyWrapper.php
diff --git a/core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyMultipleStreamWrapper.php b/core/modules/file/tests/file_test/src/StreamWrapper/DummyMultipleStreamWrapper.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyMultipleStreamWrapper.php
rename to core/modules/file/tests/file_test/src/StreamWrapper/DummyMultipleStreamWrapper.php
diff --git a/core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php b/core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php
rename to core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php
diff --git a/core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyRemoteReadOnlyStreamWrapper.php b/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteReadOnlyStreamWrapper.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyRemoteReadOnlyStreamWrapper.php
rename to core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteReadOnlyStreamWrapper.php
diff --git a/core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php b/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php
rename to core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php
diff --git a/core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyStreamWrapper.php b/core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php
similarity index 100%
rename from core/modules/file/tests/modules/file_test/src/StreamWrapper/DummyStreamWrapper.php
rename to core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php
diff --git a/core/modules/filter/tests/modules/filter_test/config/install/filter.format.filter_test.yml b/core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/config/install/filter.format.filter_test.yml
rename to core/modules/filter/tests/filter_test/config/install/filter.format.filter_test.yml
diff --git a/core/modules/filter/tests/modules/filter_test/config/install/filter.format.filtered_html.yml b/core/modules/filter/tests/filter_test/config/install/filter.format.filtered_html.yml
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/config/install/filter.format.filtered_html.yml
rename to core/modules/filter/tests/filter_test/config/install/filter.format.filtered_html.yml
diff --git a/core/modules/filter/tests/modules/filter_test/config/install/filter.format.full_html.yml b/core/modules/filter/tests/filter_test/config/install/filter.format.full_html.yml
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/config/install/filter.format.full_html.yml
rename to core/modules/filter/tests/filter_test/config/install/filter.format.full_html.yml
diff --git a/core/modules/filter/tests/modules/filter_test/config/schema/filter_test.schema.yml b/core/modules/filter/tests/filter_test/config/schema/filter_test.schema.yml
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/config/schema/filter_test.schema.yml
rename to core/modules/filter/tests/filter_test/config/schema/filter_test.schema.yml
diff --git a/core/modules/filter/tests/modules/filter_test/filter_test.info.yml b/core/modules/filter/tests/filter_test/filter_test.info.yml
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/filter_test.info.yml
rename to core/modules/filter/tests/filter_test/filter_test.info.yml
diff --git a/core/modules/filter/tests/modules/filter_test/filter_test.module b/core/modules/filter/tests/filter_test/filter_test.module
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/filter_test.module
rename to core/modules/filter/tests/filter_test/filter_test.module
diff --git a/core/modules/filter/tests/modules/filter_test/filter_test.routing.yml b/core/modules/filter/tests/filter_test/filter_test.routing.yml
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/filter_test.routing.yml
rename to core/modules/filter/tests/filter_test/filter_test.routing.yml
diff --git a/core/modules/filter/tests/modules/filter_test/src/Form/FilterTestFormatForm.php b/core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/src/Form/FilterTestFormatForm.php
rename to core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php
diff --git a/core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestAssets.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestAssets.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestAssets.php
rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestAssets.php
diff --git a/core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestCacheContexts.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheContexts.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestCacheContexts.php
rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheContexts.php
diff --git a/core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestCacheMerge.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheMerge.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestCacheMerge.php
rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheMerge.php
diff --git a/core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestCacheTags.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheTags.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestCacheTags.php
rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheTags.php
diff --git a/core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php
rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php
diff --git a/core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestReplace.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestReplace.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestReplace.php
rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestReplace.php
diff --git a/core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test/src/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
rename to core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
diff --git a/core/modules/filter/tests/modules/filter_test_plugin/filter_test_plugin.info.yml b/core/modules/filter/tests/filter_test_plugin/filter_test_plugin.info.yml
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test_plugin/filter_test_plugin.info.yml
rename to core/modules/filter/tests/filter_test_plugin/filter_test_plugin.info.yml
diff --git a/core/modules/filter/tests/modules/filter_test_plugin/src/Plugin/Filter/FilterSparkles.php b/core/modules/filter/tests/filter_test_plugin/src/Plugin/Filter/FilterSparkles.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test_plugin/src/Plugin/Filter/FilterSparkles.php
rename to core/modules/filter/tests/filter_test_plugin/src/Plugin/Filter/FilterSparkles.php
diff --git a/core/modules/filter/tests/modules/filter_test_plugin/src/Plugin/Filter/FilterTestStatic.php b/core/modules/filter/tests/filter_test_plugin/src/Plugin/Filter/FilterTestStatic.php
similarity index 100%
rename from core/modules/filter/tests/modules/filter_test_plugin/src/Plugin/Filter/FilterTestStatic.php
rename to core/modules/filter/tests/filter_test_plugin/src/Plugin/Filter/FilterTestStatic.php
diff --git a/core/modules/language/tests/modules/language_config_override_test/config/install/language/de/language_config_override_test.settings.yml b/core/modules/language/tests/language_config_override_test/config/install/language/de/language_config_override_test.settings.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_config_override_test/config/install/language/de/language_config_override_test.settings.yml
rename to core/modules/language/tests/language_config_override_test/config/install/language/de/language_config_override_test.settings.yml
diff --git a/core/modules/language/tests/modules/language_config_override_test/language_config_override_test.info.yml b/core/modules/language/tests/language_config_override_test/language_config_override_test.info.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_config_override_test/language_config_override_test.info.yml
rename to core/modules/language/tests/language_config_override_test/language_config_override_test.info.yml
diff --git a/core/modules/language/tests/modules/language_elements_test/language_elements_test.info.yml b/core/modules/language/tests/language_elements_test/language_elements_test.info.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_elements_test/language_elements_test.info.yml
rename to core/modules/language/tests/language_elements_test/language_elements_test.info.yml
diff --git a/core/modules/language/tests/modules/language_elements_test/language_elements_test.routing.yml b/core/modules/language/tests/language_elements_test/language_elements_test.routing.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_elements_test/language_elements_test.routing.yml
rename to core/modules/language/tests/language_elements_test/language_elements_test.routing.yml
diff --git a/core/modules/language/tests/modules/language_elements_test/src/Form/LanguageConfigurationElement.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php
similarity index 100%
rename from core/modules/language/tests/modules/language_elements_test/src/Form/LanguageConfigurationElement.php
rename to core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php
diff --git a/core/modules/language/tests/modules/language_elements_test/src/Form/LanguageConfigurationElementTest.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php
similarity index 100%
rename from core/modules/language/tests/modules/language_elements_test/src/Form/LanguageConfigurationElementTest.php
rename to core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php
diff --git a/core/modules/language/tests/modules/language_entity_field_access_test/config/install/language.content_settings.node.page.yml b/core/modules/language/tests/language_entity_field_access_test/config/install/language.content_settings.node.page.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_entity_field_access_test/config/install/language.content_settings.node.page.yml
rename to core/modules/language/tests/language_entity_field_access_test/config/install/language.content_settings.node.page.yml
diff --git a/core/modules/language/tests/modules/language_entity_field_access_test/config/install/node.type.page.yml b/core/modules/language/tests/language_entity_field_access_test/config/install/node.type.page.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_entity_field_access_test/config/install/node.type.page.yml
rename to core/modules/language/tests/language_entity_field_access_test/config/install/node.type.page.yml
diff --git a/core/modules/language/tests/modules/language_entity_field_access_test/language_entity_field_access_test.info.yml b/core/modules/language/tests/language_entity_field_access_test/language_entity_field_access_test.info.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_entity_field_access_test/language_entity_field_access_test.info.yml
rename to core/modules/language/tests/language_entity_field_access_test/language_entity_field_access_test.info.yml
diff --git a/core/modules/language/tests/modules/language_entity_field_access_test/language_entity_field_access_test.module b/core/modules/language/tests/language_entity_field_access_test/language_entity_field_access_test.module
similarity index 100%
rename from core/modules/language/tests/modules/language_entity_field_access_test/language_entity_field_access_test.module
rename to core/modules/language/tests/language_entity_field_access_test/language_entity_field_access_test.module
diff --git a/core/modules/language/tests/modules/language_events_test/config/schema/config_events_test.schema.yml b/core/modules/language/tests/language_events_test/config/schema/config_events_test.schema.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_events_test/config/schema/config_events_test.schema.yml
rename to core/modules/language/tests/language_events_test/config/schema/config_events_test.schema.yml
diff --git a/core/modules/language/tests/modules/language_events_test/language_events_test.info.yml b/core/modules/language/tests/language_events_test/language_events_test.info.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_events_test/language_events_test.info.yml
rename to core/modules/language/tests/language_events_test/language_events_test.info.yml
diff --git a/core/modules/language/tests/modules/language_events_test/language_events_test.services.yml b/core/modules/language/tests/language_events_test/language_events_test.services.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_events_test/language_events_test.services.yml
rename to core/modules/language/tests/language_events_test/language_events_test.services.yml
diff --git a/core/modules/language/tests/modules/language_events_test/src/EventSubscriber.php b/core/modules/language/tests/language_events_test/src/EventSubscriber.php
similarity index 100%
rename from core/modules/language/tests/modules/language_events_test/src/EventSubscriber.php
rename to core/modules/language/tests/language_events_test/src/EventSubscriber.php
diff --git a/core/modules/language/tests/modules/language_test/config/optional/views.view.no_entity_translation_view.yml b/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_test/config/optional/views.view.no_entity_translation_view.yml
rename to core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml
diff --git a/core/modules/language/tests/modules/language_test/language_test.info.yml b/core/modules/language/tests/language_test/language_test.info.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_test/language_test.info.yml
rename to core/modules/language/tests/language_test/language_test.info.yml
diff --git a/core/modules/language/tests/modules/language_test/language_test.module b/core/modules/language/tests/language_test/language_test.module
similarity index 100%
rename from core/modules/language/tests/modules/language_test/language_test.module
rename to core/modules/language/tests/language_test/language_test.module
diff --git a/core/modules/language/tests/modules/language_test/language_test.routing.yml b/core/modules/language/tests/language_test/language_test.routing.yml
similarity index 100%
rename from core/modules/language/tests/modules/language_test/language_test.routing.yml
rename to core/modules/language/tests/language_test/language_test.routing.yml
diff --git a/core/modules/language/tests/modules/language_test/src/Controller/LanguageTestController.php b/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
similarity index 100%
rename from core/modules/language/tests/modules/language_test/src/Controller/LanguageTestController.php
rename to core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
diff --git a/core/modules/language/tests/modules/language_test/src/Entity/NoLanguageEntityTest.php b/core/modules/language/tests/language_test/src/Entity/NoLanguageEntityTest.php
similarity index 100%
rename from core/modules/language/tests/modules/language_test/src/Entity/NoLanguageEntityTest.php
rename to core/modules/language/tests/language_test/src/Entity/NoLanguageEntityTest.php
diff --git a/core/modules/language/tests/modules/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php b/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php
similarity index 100%
rename from core/modules/language/tests/modules/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php
rename to core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php
diff --git a/core/modules/language/tests/modules/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php b/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php
similarity index 100%
rename from core/modules/language/tests/modules/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php
rename to core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php
diff --git a/core/modules/language/tests/modules/test_module/test_module.info.yml b/core/modules/language/tests/test_module/test_module.info.yml
similarity index 100%
rename from core/modules/language/tests/modules/test_module/test_module.info.yml
rename to core/modules/language/tests/test_module/test_module.info.yml
diff --git a/core/modules/menu_link_content/tests/modules/menu_link_content_dynamic_route/menu_link_content_dynamic_route.info.yml b/core/modules/menu_link_content/tests/menu_link_content_dynamic_route/menu_link_content_dynamic_route.info.yml
similarity index 100%
rename from core/modules/menu_link_content/tests/modules/menu_link_content_dynamic_route/menu_link_content_dynamic_route.info.yml
rename to core/modules/menu_link_content/tests/menu_link_content_dynamic_route/menu_link_content_dynamic_route.info.yml
diff --git a/core/modules/menu_link_content/tests/modules/menu_link_content_dynamic_route/menu_link_content_dynamic_route.routing.yml b/core/modules/menu_link_content/tests/menu_link_content_dynamic_route/menu_link_content_dynamic_route.routing.yml
similarity index 100%
rename from core/modules/menu_link_content/tests/modules/menu_link_content_dynamic_route/menu_link_content_dynamic_route.routing.yml
rename to core/modules/menu_link_content/tests/menu_link_content_dynamic_route/menu_link_content_dynamic_route.routing.yml
diff --git a/core/modules/menu_link_content/tests/modules/menu_link_content_dynamic_route/src/Routes.php b/core/modules/menu_link_content/tests/menu_link_content_dynamic_route/src/Routes.php
similarity index 100%
rename from core/modules/menu_link_content/tests/modules/menu_link_content_dynamic_route/src/Routes.php
rename to core/modules/menu_link_content/tests/menu_link_content_dynamic_route/src/Routes.php
diff --git a/core/modules/menu_link_content/tests/modules/menu_operations_link_test/menu_operations_link_test.info.yml b/core/modules/menu_link_content/tests/menu_operations_link_test/menu_operations_link_test.info.yml
similarity index 100%
rename from core/modules/menu_link_content/tests/modules/menu_operations_link_test/menu_operations_link_test.info.yml
rename to core/modules/menu_link_content/tests/menu_operations_link_test/menu_operations_link_test.info.yml
diff --git a/core/modules/menu_link_content/tests/modules/menu_operations_link_test/menu_operations_link_test.module b/core/modules/menu_link_content/tests/menu_operations_link_test/menu_operations_link_test.module
similarity index 100%
rename from core/modules/menu_link_content/tests/modules/menu_operations_link_test/menu_operations_link_test.module
rename to core/modules/menu_link_content/tests/menu_operations_link_test/menu_operations_link_test.module
diff --git a/core/modules/menu_link_content/tests/modules/outbound_processing_test/outbound_processing_test.info.yml b/core/modules/menu_link_content/tests/outbound_processing_test/outbound_processing_test.info.yml
similarity index 100%
rename from core/modules/menu_link_content/tests/modules/outbound_processing_test/outbound_processing_test.info.yml
rename to core/modules/menu_link_content/tests/outbound_processing_test/outbound_processing_test.info.yml
diff --git a/core/modules/menu_link_content/tests/modules/outbound_processing_test/outbound_processing_test.routing.yml b/core/modules/menu_link_content/tests/outbound_processing_test/outbound_processing_test.routing.yml
similarity index 100%
rename from core/modules/menu_link_content/tests/modules/outbound_processing_test/outbound_processing_test.routing.yml
rename to core/modules/menu_link_content/tests/outbound_processing_test/outbound_processing_test.routing.yml
diff --git a/core/modules/node/tests/modules/node_access_test_auto_bubbling/node_access_test_auto_bubbling.info.yml b/core/modules/node/tests/node_access_test_auto_bubbling/node_access_test_auto_bubbling.info.yml
similarity index 100%
rename from core/modules/node/tests/modules/node_access_test_auto_bubbling/node_access_test_auto_bubbling.info.yml
rename to core/modules/node/tests/node_access_test_auto_bubbling/node_access_test_auto_bubbling.info.yml
diff --git a/core/modules/node/tests/modules/node_access_test_auto_bubbling/node_access_test_auto_bubbling.routing.yml b/core/modules/node/tests/node_access_test_auto_bubbling/node_access_test_auto_bubbling.routing.yml
similarity index 100%
rename from core/modules/node/tests/modules/node_access_test_auto_bubbling/node_access_test_auto_bubbling.routing.yml
rename to core/modules/node/tests/node_access_test_auto_bubbling/node_access_test_auto_bubbling.routing.yml
diff --git a/core/modules/node/tests/modules/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php b/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
similarity index 100%
rename from core/modules/node/tests/modules/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
rename to core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
diff --git a/core/modules/options/tests/modules/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml
rename to core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml
diff --git a/core/modules/options/tests/modules/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
rename to core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
diff --git a/core/modules/options/tests/modules/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
rename to core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
diff --git a/core/modules/options/tests/modules/options_config_install_test/config/install/field.field.node.options_install_test.body.yml b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_config_install_test/config/install/field.field.node.options_install_test.body.yml
rename to core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.body.yml
diff --git a/core/modules/options/tests/modules/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml b/core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml
rename to core/modules/options/tests/options_config_install_test/config/install/field.field.node.options_install_test.field_options_float.yml
diff --git a/core/modules/options/tests/modules/options_config_install_test/config/install/field.storage.node.field_options_float.yml b/core/modules/options/tests/options_config_install_test/config/install/field.storage.node.field_options_float.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_config_install_test/config/install/field.storage.node.field_options_float.yml
rename to core/modules/options/tests/options_config_install_test/config/install/field.storage.node.field_options_float.yml
diff --git a/core/modules/options/tests/modules/options_config_install_test/config/install/node.type.options_install_test.yml b/core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_config_install_test/config/install/node.type.options_install_test.yml
rename to core/modules/options/tests/options_config_install_test/config/install/node.type.options_install_test.yml
diff --git a/core/modules/options/tests/modules/options_config_install_test/options_config_install_test.info.yml b/core/modules/options/tests/options_config_install_test/options_config_install_test.info.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_config_install_test/options_config_install_test.info.yml
rename to core/modules/options/tests/options_config_install_test/options_config_install_test.info.yml
diff --git a/core/modules/options/tests/modules/options_test/options_test.info.yml b/core/modules/options/tests/options_test/options_test.info.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_test/options_test.info.yml
rename to core/modules/options/tests/options_test/options_test.info.yml
diff --git a/core/modules/options/tests/modules/options_test/options_test.module b/core/modules/options/tests/options_test/options_test.module
similarity index 100%
rename from core/modules/options/tests/modules/options_test/options_test.module
rename to core/modules/options/tests/options_test/options_test.module
diff --git a/core/modules/options/tests/modules/options_test_views/options_test_views.info.yml b/core/modules/options/tests/options_test_views/options_test_views.info.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_test_views/options_test_views.info.yml
rename to core/modules/options/tests/options_test_views/options_test_views.info.yml
diff --git a/core/modules/options/tests/modules/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml
rename to core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_numeric.yml
diff --git a/core/modules/options/tests/modules/options_test_views/test_views/views.view.test_options_list_argument_string.yml b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_test_views/test_views/views.view.test_options_list_argument_string.yml
rename to core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_argument_string.yml
diff --git a/core/modules/options/tests/modules/options_test_views/test_views/views.view.test_options_list_filter.yml b/core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml
similarity index 100%
rename from core/modules/options/tests/modules/options_test_views/test_views/views.view.test_options_list_filter.yml
rename to core/modules/options/tests/options_test_views/test_views/views.view.test_options_list_filter.yml
diff --git a/core/modules/serialization/tests/modules/serialization_test/serialization_test.info.yml b/core/modules/serialization/tests/serialization_test/serialization_test.info.yml
similarity index 100%
rename from core/modules/serialization/tests/modules/serialization_test/serialization_test.info.yml
rename to core/modules/serialization/tests/serialization_test/serialization_test.info.yml
diff --git a/core/modules/serialization/tests/modules/serialization_test/serialization_test.services.yml b/core/modules/serialization/tests/serialization_test/serialization_test.services.yml
similarity index 100%
rename from core/modules/serialization/tests/modules/serialization_test/serialization_test.services.yml
rename to core/modules/serialization/tests/serialization_test/serialization_test.services.yml
diff --git a/core/modules/serialization/tests/modules/serialization_test/src/SerializationTestEncoder.php b/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php
similarity index 100%
rename from core/modules/serialization/tests/modules/serialization_test/src/SerializationTestEncoder.php
rename to core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php
diff --git a/core/modules/serialization/tests/modules/serialization_test/src/SerializationTestNormalizer.php b/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php
similarity index 100%
rename from core/modules/serialization/tests/modules/serialization_test/src/SerializationTestNormalizer.php
rename to core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
index 97cdbe81e74..dfd08b885cb 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
@@ -452,7 +452,7 @@ class ConfigSchemaTest extends KernelTestBase {
     // Ensure that configuration objects with keys marked as ignored are not
     // changed when saved. The 'config_schema_test.ignore' will have been saved
     // during the installation of configuration in the setUp method.
-    $extension_path = __DIR__ . '/../../../../../modules/config/tests/modules/config_schema_test/';
+    $extension_path = __DIR__ . '/../../../../../modules/config/tests/config_schema_test/';
     $install_storage = new FileStorage($extension_path . InstallStorage::CONFIG_INSTALL_DIRECTORY);
     $original_data = $install_storage->read('config_schema_test.ignore');
     $installed_data = $this->config('config_schema_test.ignore')->get();