diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_dynamic.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_dynamic.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_static.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_static.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_mini_pager.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_mini_pager.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_pager_none.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_pager_some.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_preview.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_redirect_view.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_reset_button.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_simple_argument.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_store_pager_settings.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_style_mapping.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_tokens.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_view.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_view_argument_validate_php.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_view_delete.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_view_handler_weight.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_view_render.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_view_status.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_view_storage.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml
similarity index 100%
rename from core/modules/views/tests/views_test_config/test_views/views.view.test_views_groupby_save.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml
diff --git a/core/modules/views/tests/views_test_config/views_test_config.info b/core/modules/views/tests/modules/views_test_config/views_test_config.info
similarity index 100%
rename from core/modules/views/tests/views_test_config/views_test_config.info
rename to core/modules/views/tests/modules/views_test_config/views_test_config.info
diff --git a/core/modules/views/tests/views_test_config/views_test_config.module b/core/modules/views/tests/modules/views_test_config/views_test_config.module
similarity index 100%
rename from core/modules/views/tests/views_test_config/views_test_config.module
rename to core/modules/views/tests/modules/views_test_config/views_test_config.module
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/DynamicTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php
diff --git a/core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php
diff --git a/core/modules/views/tests/views_test_data/templates/views-view--frontpage.tpl.php b/core/modules/views/tests/modules/views_test_data/templates/views-view--frontpage.tpl.php
similarity index 100%
rename from core/modules/views/tests/views_test_data/templates/views-view--frontpage.tpl.php
rename to core/modules/views/tests/modules/views_test_data/templates/views-view--frontpage.tpl.php
diff --git a/core/modules/views/tests/views_test_data/views_cache.test.css b/core/modules/views/tests/modules/views_test_data/views_cache.test.css
similarity index 100%
rename from core/modules/views/tests/views_test_data/views_cache.test.css
rename to core/modules/views/tests/modules/views_test_data/views_cache.test.css
diff --git a/core/modules/views/tests/views_test_data/views_cache.test.js b/core/modules/views/tests/modules/views_test_data/views_cache.test.js
similarity index 100%
rename from core/modules/views/tests/views_test_data/views_cache.test.js
rename to core/modules/views/tests/modules/views_test_data/views_cache.test.js
diff --git a/core/modules/views/tests/views_test_data/views_test_data.info b/core/modules/views/tests/modules/views_test_data/views_test_data.info
similarity index 100%
rename from core/modules/views/tests/views_test_data/views_test_data.info
rename to core/modules/views/tests/modules/views_test_data/views_test_data.info
diff --git a/core/modules/views/tests/views_test_data/views_test_data.install b/core/modules/views/tests/modules/views_test_data/views_test_data.install
similarity index 100%
rename from core/modules/views/tests/views_test_data/views_test_data.install
rename to core/modules/views/tests/modules/views_test_data/views_test_data.install
diff --git a/core/modules/views/tests/views_test_data/views_test_data.module b/core/modules/views/tests/modules/views_test_data/views_test_data.module
similarity index 100%
rename from core/modules/views/tests/views_test_data/views_test_data.module
rename to core/modules/views/tests/modules/views_test_data/views_test_data.module
diff --git a/core/modules/views/tests/views_test_data/views_test_data.views.inc b/core/modules/views/tests/modules/views_test_data/views_test_data.views.inc
similarity index 100%
rename from core/modules/views/tests/views_test_data/views_test_data.views.inc
rename to core/modules/views/tests/modules/views_test_data/views_test_data.views.inc