diff --git a/tests/views_query.test b/tests/views_query.test
index 4ad0361..a4b52d4 100644
--- a/tests/views_query.test
+++ b/tests/views_query.test
@@ -129,14 +129,13 @@ abstract class ViewsTestCase extends WebTestBase {
 abstract class ViewsSqlTest extends ViewsTestCase {
 
   protected function setUp() {
-    parent::setUp('views', 'views_ui');
-
     // Define the schema and views data variable before enabling the test module.
     variable_set('views_test_schema', $this->schemaDefinition());
     variable_set('views_test_views_data', $this->viewsData());
     variable_set('views_test_views_plugins', $this->viewsPlugins());
 
-    module_enable(array('views_test'));
+    parent::setUp('views', 'views_ui', 'views_test');
+//    module_enable(array('views_test'));
     $this->resetAll();
 
     // Load the test dataset.
diff --git a/views_ui.info b/view_ui/views_ui.info
similarity index 68%
rename from views_ui.info
rename to view_ui/views_ui.info
index b131de9..ed204bf 100644
--- a/views_ui.info
+++ b/view_ui/views_ui.info
@@ -4,5 +4,4 @@ package = Views
 core = 8.x
 configure = admin/structure/views
 dependencies[] = views
-files[] = views_ui.module
-files[] = plugins/views_wizard/views_ui_base_views_wizard.class.php
+
diff --git a/views_ui.module b/view_ui/views_ui.module
similarity index 100%
rename from views_ui.module
rename to view_ui/views_ui.module
diff --git a/views.info b/views.info
index 8477fc2..1ef3cc8 100644
--- a/views.info
+++ b/views.info
@@ -267,3 +267,6 @@ files[] = tests/user/views_user.test
 files[] = tests/views_cache.test
 files[] = tests/views_view.test
 files[] = tests/views_ui.test
+
+; Temporarily moved from views_ui.info.
+files[] = plugins/views_wizard/views_ui_base_views_wizard.class.php