diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/AnalyzeTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/AnalyzeTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/AnalyzeTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/AnalyzeTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/CachedDataUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/CachedDataUITest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DefaultViewsTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/DefaultViewsTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayAttachmentTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/DisplayAttachmentTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayPath.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/DisplayPath.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/GroupByTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/GroupByTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/HandlerTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/HandlerTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/OverrideDisplaysTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/OverrideDisplaysTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/PreviewTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/PreviewTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/QueryTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/QueryTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/RedirectTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RedirectTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/RedirectTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/RedirectTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/RowUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/RowUITest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/StorageTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/StorageTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/StyleUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/StyleUITest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/UITestBase.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/UI/UITestBase.php
rename to core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php