diff --git a/lib/Drupal/views/Tests/AccessTest.php b/lib/Drupal/views/Tests/AccessTest.php
index 599362ff104a46a3ccd3a765bca0b20553f266b7..6cd3283ee640a24435b0e0278248dbc1a187d644 100644
--- a/lib/Drupal/views/Tests/AccessTest.php
+++ b/lib/Drupal/views/Tests/AccessTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use Drupal\simpletest\WebTestBase;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/Field/ApiDataTest.php b/lib/Drupal/views/Tests/Field/ApiDataTest.php
index fc6082116f619eb2b1f621bfd526b161e528fbed..18c62c5da6b9ecf7c3b6d01ca8df83e7bf356373 100644
--- a/lib/Drupal/views/Tests/Field/ApiDataTest.php
+++ b/lib/Drupal/views/Tests/Field/ApiDataTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests\Field;
 
-use Drupal\simpletest\WebTestBase;
-
 /**
  * Test the produced views_data.
  */
diff --git a/lib/Drupal/views/Tests/Field/ApiTestBase.php b/lib/Drupal/views/Tests/Field/ApiTestBase.php
index 8b8b7165962c3ecdfc7f1c541f8c23c54ae6a2dc..7e2c897a0efcdb8ee8b5b887eac27aa8ec6663b1 100644
--- a/lib/Drupal/views/Tests/Field/ApiTestBase.php
+++ b/lib/Drupal/views/Tests/Field/ApiTestBase.php
@@ -18,7 +18,6 @@
 
 namespace Drupal\views\Tests\Field;
 
-use Drupal\simpletest\WebTestBase;
 use Drupal\views\Tests\ViewsSqlTest;
 
 /**
diff --git a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
index cb4f608360d6f6c6d34a4d2505ed906d66249fcf..9116d2c2c8a04481e0d581943da028531a62d1be 100644
--- a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
+++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests\Field;
 
-use Drupal\simpletest\WebTestBase;
 use Drupal\views\View;
 
 /**
diff --git a/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index d5a22f9533470c54c86f97a47a7d4f9376447f12..e86bed10e08aec52c161c1ab7dab38545517f235 100644
--- a/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -34,7 +34,6 @@ function setUp() {
     $this->map = array(
       'nid' => 'nid',
     );
-    $this->enableViewsUi();
   }
 
   /**
diff --git a/lib/Drupal/views/Tests/TranslatableTest.php b/lib/Drupal/views/Tests/TranslatableTest.php
index 585e0080fc2dd305e7c9f32f33c2f8f9b0a65df0..7a10282d4b374d774683f9f6274dc25985799e3d 100644
--- a/lib/Drupal/views/Tests/TranslatableTest.php
+++ b/lib/Drupal/views/Tests/TranslatableTest.php
@@ -30,7 +30,6 @@ public function setUp() {
     // Reset the plugin data.
     views_fetch_plugin_data(NULL, NULL, TRUE);
     $this->strings = array('Master1', 'Apply1', 'Sort By1', 'Asc1', 'Desc1', 'more1', 'Reset1', 'Offset1', 'Master1', 'title1', 'Items per page1', 'fieldlabel1', 'filterlabel1');
-    $this->enableViewsUi();
   }
 
   /**
diff --git a/lib/Drupal/views/Tests/UiGroupByTest.php b/lib/Drupal/views/Tests/UiGroupByTest.php
index 06418781d762ca29c568c2063638c0494f285cd7..d4174f0c5ad2a9b097c3f7b5b7b1114229366b07 100644
--- a/lib/Drupal/views/Tests/UiGroupByTest.php
+++ b/lib/Drupal/views/Tests/UiGroupByTest.php
@@ -7,12 +7,10 @@
 
 namespace Drupal\views\Tests;
 
-use Drupal\simpletest\WebTestBase;
-
 /**
  * Tests UI of aggregate functionality..
  */
-class UiGroupByTest extends WebTestBase {
+class UiGroupByTest extends ViewsTestBase {
 
   /**
    * Modules to enable.
diff --git a/lib/Drupal/views/Tests/UiSettingsTest.php b/lib/Drupal/views/Tests/UiSettingsTest.php
index 2f36be30afd20d761b8cc25688ff07acd416064d..5542847e601a7bbffa8d84a6b2dcbc98fb896517 100644
--- a/lib/Drupal/views/Tests/UiSettingsTest.php
+++ b/lib/Drupal/views/Tests/UiSettingsTest.php
@@ -7,12 +7,10 @@
 
 namespace Drupal\views\Tests;
 
-use Drupal\simpletest\WebTestBase;
-
 /**
  * Tests the various settings in the views ui.
  */
-class UiSettingsTest extends WebTestBase {
+class UiSettingsTest extends ViewsTestBase {
 
   /**
    * Modules to enable.
diff --git a/lib/Drupal/views/Tests/ViewsSqlTest.php b/lib/Drupal/views/Tests/ViewsSqlTest.php
index d6db786e260af00bf9614e22e3eed5ee7d1e69f6..2c54c92bedd988c8f3e937aa55be3c12e95b26c6 100644
--- a/lib/Drupal/views/Tests/ViewsSqlTest.php
+++ b/lib/Drupal/views/Tests/ViewsSqlTest.php
@@ -40,20 +40,6 @@ protected function setUp() {
     $this->checkPermissions(array(), TRUE);
   }
 
-  /**
-   * This function allows to enable views ui from a higher class which can't change the setup function anymore.
-   *
-   * @TODO
-   *   Convert existing setUp functions.
-   */
-  function enableViewsUi() {
-    module_enable(array('views_ui'));
-    // @TODO Figure out why it's required to clear the cache here.
-    views_module_include('views_default', TRUE);
-    views_get_all_views(TRUE);
-    menu_router_rebuild();
-  }
-
   /**
    * The schema definition.
    */
diff --git a/lib/Drupal/views/Tests/ViewsTestBase.php b/lib/Drupal/views/Tests/ViewsTestBase.php
index 443ffa1ca58227d06f76656d46eda30a7f2a7d5a..5e0db3001176276d1b8bcab77d189f8b9b3b192a 100644
--- a/lib/Drupal/views/Tests/ViewsTestBase.php
+++ b/lib/Drupal/views/Tests/ViewsTestBase.php
@@ -18,7 +18,17 @@ abstract class ViewsTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('views');
+  public static $modules = array('views', 'views_ui');
+
+  protected function setUp() {
+    parent::setUp();
+
+    // @todo Remove this hack or move it to child classes.
+    views_init();
+    views_module_include('views_default', TRUE);
+    views_get_all_views(TRUE);
+    menu_router_rebuild();
+  }
 
   /**
    * Helper function: verify a result set returned by view.