diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
index 4454101..f67d9fe 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
@@ -2,24 +2,24 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\ExposedFormTest.
+ * Contains \Drupal\views\Tests\Plugin\ExposedFormTest.
  */
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\views\Tests\UI\UITestBase;
+use Drupal\views\Tests\ViewTestBase;
 
 /**
  * Tests exposed forms.
  */
-class ExposedFormTest extends UITestBase {
+class ExposedFormTest extends ViewTestBase {
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_reset_button', 'test_exposed_admin_ui');
+  public static $testViews = array('test_reset_button');
 
   /**
    * Modules to enable.
@@ -40,7 +40,6 @@ protected function setUp() {
     parent::setUp();
 
     $this->drupalCreateContentType(array('type' => 'article'));
-    $this->drupalCreateContentType(array('type' => 'page'));
 
     // Create some random nodes.
     for ($i = 0; $i < 5; $i++) {
@@ -104,125 +103,4 @@ public function testExposedFormRender() {
     $this->assertFieldByXPath('//form/@action', $expected_action, 'The expected value for the action attribute was found.');
   }
 
-  /**
-   * Tests the admin interface of exposed filter and sort items.
-   */
-  function testExposedAdminUi() {
-    menu_router_rebuild();
-    $edit = array();
-
-    $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
-    // Be sure that the button is called exposed.
-    $this->helperButtonHasLabel('edit-options-expose-button-button', t('Expose filter'));
-
-    // The first time the filter UI is displayed, the operator and the
-    // value forms should be shown.
-    $this->assertFieldById('edit-options-operator-in', '', 'Operator In exists');
-    $this->assertFieldById('edit-options-operator-not-in', '', 'Operator Not In exists');
-    $this->assertFieldById('edit-options-value-page', '', 'Checkbox for Page exists');
-    $this->assertFieldById('edit-options-value-article', '', 'Checkbox for Article exists');
-
-    // Click the Expose filter button.
-    $this->drupalPost('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type', $edit, t('Expose filter'));
-    // Check the label of the expose button.
-    $this->helperButtonHasLabel('edit-options-expose-button-button', t('Hide filter'));
-    // Check the label of the grouped exposed button
-    $this->helperButtonHasLabel('edit-options-group-button-button', t('Grouped filters'));
-
-    // After exposing the filter, Operator and Value should be still here.
-    $this->assertFieldById('edit-options-operator-in', '', 'Operator In exists');
-    $this->assertFieldById('edit-options-operator-not-in', '', 'Operator Not In exists');
-    $this->assertFieldById('edit-options-value-page', '', 'Checkbox for Page exists');
-    $this->assertFieldById('edit-options-value-article', '', 'Checkbox for Article exists');
-
-    // Check the validations of the filter handler.
-    $edit = array();
-    $edit['options[expose][identifier]'] = '';
-    $this->drupalPost(NULL, $edit, t('Apply'));
-    $this->assertText(t('The identifier is required if the filter is exposed.'));
-
-    $edit = array();
-    $edit['options[expose][identifier]'] = 'value';
-    $this->drupalPost(NULL, $edit, t('Apply'));
-    $this->assertText(t('This identifier is not allowed.'));
-
-    // Now check the sort criteria.
-    $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/sort/created');
-    $this->helperButtonHasLabel('edit-options-expose-button-button', t('Expose sort'));
-    $this->assertNoFieldById('edit-options-expose-label', '', t('Make sure no label field is shown'));
-
-    // Click the Grouped Filters button.
-    $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
-    $this->drupalPost(NULL, array(), t('Grouped filters'));
-
-    // After click on 'Grouped Filters', the standard operator and value should
-    // not be displayed.
-    $this->assertNoFieldById('edit-options-operator-in', '', 'Operator In not exists');
-    $this->assertNoFieldById('edit-options-operator-not-in', '', 'Operator Not In not exists');
-    $this->assertNoFieldById('edit-options-value-page', '', 'Checkbox for Page not exists');
-    $this->assertNoFieldById('edit-options-value-article', '', 'Checkbox for Article not exists');
-
-    // Check that after click on 'Grouped Filters', a new button is shown to
-    // add more items to the list.
-    $this->helperButtonHasLabel('edit-options-group-info-add-group', t('Add another item'));
-
-    // Create a grouped filter
-    $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
-    $edit = array();
-    $edit["options[group_info][group_items][1][title]"] = 'Is Article';
-    $edit["options[group_info][group_items][1][value][article]"] = 'article';
-
-    $edit["options[group_info][group_items][2][title]"] = 'Is Page';
-    $edit["options[group_info][group_items][2][value][page]"] = TRUE;
-
-    $edit["options[group_info][group_items][3][title]"] = 'Is Page and Article';
-    $edit["options[group_info][group_items][3][value][article]"] = TRUE;
-    $edit["options[group_info][group_items][3][value][page]"] = TRUE;
-    $this->drupalPost(NULL, $edit, t('Apply'));
-
-    // Select the empty operator, so the empty value should not trigger a form
-    // error.
-    $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/body_value');
-    $edit = array();
-    $edit["options[group_info][group_items][1][title]"] = $this->randomName();
-    $edit["options[group_info][group_items][1][operator]"] = 'empty';
-    $this->drupalPost(NULL, $edit, t('Apply'));
-    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', array(), 'Validation did not run for the empty operator.');
-    // Test the validation error message text is not shown.
-    $this->assertNoText(t('The value is required if title for this item is defined.'));
-
-    // Validate that all the titles are defined for each group
-    $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
-    $edit = array();
-    $edit["options[group_info][group_items][1][title]"] = 'Is Article';
-    $edit["options[group_info][group_items][1][value][article]"] = TRUE;
-
-    // This should trigger an error
-    $edit["options[group_info][group_items][2][title]"] = '';
-    $edit["options[group_info][group_items][2][value][page]"] = TRUE;
-
-    $edit["options[group_info][group_items][3][title]"] = 'Is Page and Article';
-    $edit["options[group_info][group_items][3][value][article]"] = TRUE;
-    $edit["options[group_info][group_items][3][value][page]"] = TRUE;
-    $this->drupalPost(NULL, $edit, t('Apply'));
-    $this->assertRaw(t('The title is required if value for this item is defined.'), t('Group items should have a title'));
-
-    // Un-expose the filter.
-    $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
-    $this->drupalPost(NULL, array(), t('Hide filter'));
-
-    // After Un-exposing the filter, Operator and Value should be shown again.
-    $this->assertFieldById('edit-options-operator-in', '', 'Operator In exists after hide filter');
-    $this->assertFieldById('edit-options-operator-not-in', '', 'Operator Not In exists after hide filter');
-    $this->assertFieldById('edit-options-value-page', '', 'Checkbox for Page exists after hide filter');
-    $this->assertFieldById('edit-options-value-article', '', 'Checkbox for Article exists after hide filter');
-
-    // Click the Expose sort button.
-    $edit = array();
-    $this->drupalPost('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/sort/created', $edit, t('Expose sort'));
-    // Check the label of the expose button.
-    $this->helperButtonHasLabel('edit-options-expose-button-button', t('Hide sort'));
-    $this->assertFieldById('edit-options-expose-label', '', t('Make sure a label field is shown'));
-  }
-
 }
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 94%
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
index 6d79f8b..d3424aa 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/AnalyzeTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/AnalyzeTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\UI\AnalyzeTest.
+ * Contains \Drupal\views_ui\Tests\AnalyzeTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 use Drupal\views\Tests\ViewTestBase;
 
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 95%
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
index 449f0fe..b97f4df 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/CachedDataUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\UI\CachedDataUITest.
+ * Contains \Drupal\views_ui\Tests\CachedDataUITest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the user tempstore cache in the UI.
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 97%
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
index 2416c42..7d40e72 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\UI\CustomBooleanTest.
+ * Contains \Drupal\views_ui\Tests\CustomBooleanTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the UI and functionality for the Custom boolean field handler options.
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 98%
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
index 6597d96..5f9a1ab 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DefaultViewsTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\UI\DefaultViewsTest.
+ * Definition of Drupal\views_ui\Tests\DefaultViewsTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests enabling, disabling, and reverting default views via the listing page.
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 94%
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
index df1a94b..4e4fe7b 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayAttachmentTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
@@ -2,10 +2,10 @@
 
   /**
    * @file
-   * Contains \Drupal\views\Tests\UI\DisplayAttachmentTest.
+   * Contains \Drupal\views_ui\Tests\DisplayAttachmentTest.
    */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the UI for the attachment display plugin.
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 93%
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
index 7f11dec..b4de4f9 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
@@ -2,10 +2,10 @@
 
   /**
    * @file
-   * Definition of Drupal\views\Tests\UI\DisplayExtenderUITest.
+   * Contains \Drupal\views_ui\Tests\DisplayExtenderUITest.
    */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the display extender UI.
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 95%
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
index ca9d3d7..315ad62 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayPath.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\UI\DisplayPath
+ * Contains \Drupal\views_ui\Tests\DisplayPath
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the UI of generic display path plugin.
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 99%
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
index 4e7f32d..3c22792 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\UI\DisplayTest.
+ * Contains \Drupal\views_ui\Tests\DisplayTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the handling of displays in the UI, adding removing etc.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php
similarity index 73%
copy from core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
copy to core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php
index 4454101..5757bcd 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php
@@ -2,37 +2,28 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugin\ExposedFormTest.
+ * Contains \Drupal\views_ui\Tests\ExposedFormUITest.
  */
 
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Tests\UI\UITestBase;
+namespace Drupal\views_ui\Tests;
 
 /**
- * Tests exposed forms.
+ * Tests exposed form UI.
  */
-class ExposedFormTest extends UITestBase {
+class ExposedFormUITest extends UITestBase {
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_reset_button', 'test_exposed_admin_ui');
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('views_ui');
+  public static $testViews = array('test_exposed_admin_ui');
 
   public static function getInfo() {
     return array(
       'name' => 'Exposed forms',
-      'description' => 'Test exposed forms functionality.',
-      'group' => 'Views Plugins',
+      'description' => 'Test exposed forms UI functionality.',
+      'group' => 'Views UI',
     );
   }
 
@@ -49,62 +40,6 @@ protected function setUp() {
   }
 
   /**
-   * Tests whether the reset button works on an exposed form.
-   */
-  public function testResetButton() {
-    $this->drupalGet('test_reset_button', array('query' => array('type' => 'article')));
-    // Test that the type has been set.
-    $this->assertFieldById('edit-type', 'article', 'Article type filter set.');
-
-    // Test the reset works.
-    $this->drupalGet('test_reset_button', array('query' => array('op' => 'Reset')));
-    $this->assertResponse(200);
-    // Test the type has been reset.
-    $this->assertFieldById('edit-type', 'All', 'Article type filter has been reset.');
-  }
-
-  /**
-   * Tests, whether and how the reset button can be renamed.
-   */
-  public function testRenameResetButton() {
-    // Look at the page and check the label "reset".
-    $this->drupalGet('test_reset_button');
-    // Rename the label of the reset button.
-    $view = views_get_view('test_reset_button');
-    $view->setDisplay();
-
-    $exposed_form = $view->display_handler->getOption('exposed_form');
-    $exposed_form['options']['reset_button_label'] = $expected_label = $this->randomName();
-    $exposed_form['options']['reset_button'] = TRUE;
-    $view->display_handler->setOption('exposed_form', $exposed_form);
-    $view->save();
-
-    views_invalidate_cache();
-
-    // Look whether ther reset button label changed.
-    $this->drupalGet('test_reset_button');
-    $this->assertResponse(200);
-
-    $this->helperButtonHasLabel('edit-reset', $expected_label);
-  }
-
-  /**
-   * Tests the exposed form markup.
-   */
-  public function testExposedFormRender() {
-    $view = views_get_view('test_reset_button');
-    $this->executeView($view);
-    $exposed_form = $view->display_handler->getPlugin('exposed_form');
-    $this->drupalSetContent($exposed_form->render_exposed_form());
-
-    $expected_id = drupal_clean_css_identifier('views-exposed-form-' . $view->storage->id() . '-' . $view->current_display);
-    $this->assertFieldByXpath('//form/@id', $expected_id, 'Expected form ID found.');
-
-    $expected_action = url($view->display_handler->getUrl());
-    $this->assertFieldByXPath('//form/@action', $expected_action, 'The expected value for the action attribute was found.');
-  }
-
-  /**
    * Tests the admin interface of exposed filter and sort items.
    */
   function testExposedAdminUi() {
@@ -224,5 +159,4 @@ function testExposedAdminUi() {
     $this->helperButtonHasLabel('edit-options-expose-button-button', t('Hide sort'));
     $this->assertFieldById('edit-options-expose-label', '', t('Make sure a label field is shown'));
   }
-
 }
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 95%
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
index 447b0b4..da8cf5f 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/GroupByTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\UI\GroupByTest.
+ * Contains \Drupal\views_ui\Tests\GroupByTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests UI of aggregate functionality..
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 98%
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
index 5c0845e..b8ab21e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/HandlerTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\UI\HandlerTest.
+ * Contains \Drupal\views_ui\Tests\HandlerTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 use Drupal\views\ViewExecutable;
 
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 98%
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
index e516e40..69f2730 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/OverrideDisplaysTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\UI\OverrideDisplaysTest.
+ * Contains \Drupal\views_ui\Tests\OverrideDisplaysTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests that displays can be correctly overridden via the user interface.
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 96%
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
index f9aea91..adb7425 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/PreviewTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\UI\PreviewTest.
+ * Contains \Drupal\views_ui\Tests\PreviewTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the preview form in the UI.
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 94%
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
index f4e1b36..33d69cd 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/QueryTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\UI\QueryTest.
+ * Contains \Drupal\views_ui\Tests\QueryTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views_test_data\Plugin\views\query\QueryTest as QueryTestPlugin;
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 95%
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
index d4dd083..d67c6fb 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/RedirectTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RedirectTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\tests\UI\RedirectTest.
+ * Contains \Drupal\views_ui\tests\RedirectTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the redirecting after saving a views.
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 96%
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
index 2b42157..e522e8f 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/RowUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\UI\RowUITest.
+ * Contains \Drupal\views_ui\Tests\RowUITest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the UI of row plugins.
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 98%
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
index 7f282b4..1d49959 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\UI\SettingsTest.
+ * Contains \Drupal\views_ui\Tests\SettingsTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the various settings in the views UI.
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 94%
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
index e6a66cd..0f32d96 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/StorageTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\tests\UI\StorageTest.
+ * Contains \Drupal\views_ui\tests\StorageTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 use Drupal\Core\Language\Language;
 
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 96%
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
index 034f463..5666547 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/StyleUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\UI\StyleUITest.
+ * Contains \Drupal\views_ui\Tests\StyleUITest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 /**
  * Tests the UI of style plugins.
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 96%
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
index 06138e6..b388d41 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\tests\UI\TagTest.
+ * Contains \Drupal\views_ui\tests\TagTest.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views_ui\Routing\ViewsUIController;
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 88%
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
index 334dfad..19be098 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/UITestBase.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\UI\UITestBase.
+ * Contains \Drupal\views_ui\Tests\UITestBase.
  */
 
-namespace Drupal\views\Tests\UI;
+namespace Drupal\views_ui\Tests;
 
 use Drupal\views\Tests\ViewTestBase;