diff --git a/core/modules/user/tests/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php b/core/modules/user/tests/modules/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php
similarity index 100%
rename from core/modules/user/tests/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php
rename to core/modules/user/tests/modules/user_custom_phpass_params_test/lib/Drupal/user_custom_phpass_params_test/UserCustomPhpassParamsTestBundle.php
diff --git a/core/modules/user/tests/user_custom_phpass_params_test/user_custom_phpass_params_test.info b/core/modules/user/tests/modules/user_custom_phpass_params_test/user_custom_phpass_params_test.info
similarity index 100%
rename from core/modules/user/tests/user_custom_phpass_params_test/user_custom_phpass_params_test.info
rename to core/modules/user/tests/modules/user_custom_phpass_params_test/user_custom_phpass_params_test.info
diff --git a/core/modules/user/tests/user_custom_phpass_params_test/user_custom_phpass_params_test.module b/core/modules/user/tests/modules/user_custom_phpass_params_test/user_custom_phpass_params_test.module
similarity index 100%
rename from core/modules/user/tests/user_custom_phpass_params_test/user_custom_phpass_params_test.module
rename to core/modules/user/tests/modules/user_custom_phpass_params_test/user_custom_phpass_params_test.module
diff --git a/core/modules/user/tests/user_form_test.info b/core/modules/user/tests/modules/user_form_test/user_form_test.info
similarity index 100%
rename from core/modules/user/tests/user_form_test.info
rename to core/modules/user/tests/modules/user_form_test/user_form_test.info
diff --git a/core/modules/user/tests/user_form_test.module b/core/modules/user/tests/modules/user_form_test/user_form_test.module
similarity index 100%
rename from core/modules/user/tests/user_form_test.module
rename to core/modules/user/tests/modules/user_form_test/user_form_test.module
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml
similarity index 100%
rename from core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml
rename to core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml
similarity index 100%
rename from core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml
rename to core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml
similarity index 100%
rename from core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml
rename to core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
similarity index 100%
rename from core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
rename to core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml
similarity index 100%
rename from core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml
rename to core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml
similarity index 100%
rename from core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml
rename to core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml
similarity index 100%
rename from core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml
rename to core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
similarity index 100%
rename from core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
rename to core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
diff --git a/core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
similarity index 100%
rename from core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
rename to core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
diff --git a/core/modules/user/tests/user_test_views/user_test_views.info b/core/modules/user/tests/modules/user_test_views/user_test_views.info
similarity index 100%
rename from core/modules/user/tests/user_test_views/user_test_views.info
rename to core/modules/user/tests/modules/user_test_views/user_test_views.info
diff --git a/core/modules/user/tests/user_test_views/user_test_views.module b/core/modules/user/tests/modules/user_test_views/user_test_views.module
similarity index 100%
rename from core/modules/user/tests/user_test_views/user_test_views.module
rename to core/modules/user/tests/modules/user_test_views/user_test_views.module