diff --git a/lib/Drupal/views/Tests/AnalyzeTest.php b/lib/Drupal/views/Tests/AnalyzeTest.php
index 41c8844..4ebcf59 100644
--- a/lib/Drupal/views/Tests/AnalyzeTest.php
+++ b/lib/Drupal/views/Tests/AnalyzeTest.php
@@ -40,7 +40,7 @@ public function setUp() {
   function testAnalyzeBasic() {
     $this->drupalLogin($this->admin);
     // Enable the frontpage view and click the analyse button.
-    $view = views_get_view('frontpage');
+    $view = $this->getView();
     $view->save();
 
     $this->drupalGet('admin/structure/views/view/frontpage/edit');
@@ -54,4 +54,11 @@ function testAnalyzeBasic() {
     $this->drupalPost(NULL, array(), t('Ok'));
   }
 
+  /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('frontpage');
+  }
+
 }
diff --git a/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php b/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php
index 8410b5d..e9d7faf 100644
--- a/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php
+++ b/lib/Drupal/views/Tests/Comment/ArgumentUserUIDTest.php
@@ -21,7 +21,8 @@ public static function getInfo() {
   }
 
   function testCommentUserUIDTest() {
-    $this->executeView($this->view, array($this->account->uid));
+    $view = $this->getView();
+    $this->executeView($view, array($this->account->uid));
     $result_set = array(
       array(
         'nid' => $this->node_user_posted->nid,
@@ -31,7 +32,7 @@ function testCommentUserUIDTest() {
       ),
     );
     $this->column_map = array('nid' => 'nid');
-    $this->assertIdenticalResultset($this->view, $result_set, $this->column_map);
+    $this->assertIdenticalResultset($view, $result_set, $this->column_map);
   }
 
 }
diff --git a/lib/Drupal/views/Tests/Comment/CommentTestBase.php b/lib/Drupal/views/Tests/Comment/CommentTestBase.php
index a855afe..baadd61 100644
--- a/lib/Drupal/views/Tests/Comment/CommentTestBase.php
+++ b/lib/Drupal/views/Tests/Comment/CommentTestBase.php
@@ -46,7 +46,7 @@ function setUp() {
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_comment_user_uid');
+    return views_get_view('test_comment_user_uid');
   }
 
 }
diff --git a/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php b/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php
index 00ba08c..a85c9b8 100644
--- a/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php
+++ b/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php
@@ -23,7 +23,8 @@ public static function getInfo() {
   }
 
   function testCommentUserUIDTest() {
-    $this->view->setItem('default', 'argument', 'uid_touch', NULL);
+    $view = $this->getView();
+    $view->setItem('default', 'argument', 'uid_touch', NULL);
 
     $options = array(
       'id' => 'uid_touch',
@@ -31,8 +32,8 @@ function testCommentUserUIDTest() {
       'field' => 'uid_touch',
       'value' => array($this->loggedInUser->uid),
     );
-    $this->view->addItem('default', 'filter', 'node', 'uid_touch', $options);
-    $this->executeView($this->view, array($this->account->uid));
+    $view->addItem('default', 'filter', 'node', 'uid_touch', $options);
+    $this->executeView($view, array($this->account->uid));
     $result_set = array(
       array(
         'nid' => $this->node_user_posted->nid,
@@ -42,7 +43,7 @@ function testCommentUserUIDTest() {
       ),
     );
     $this->column_map = array('nid' => 'nid');
-    $this->assertIdenticalResultset($this->view, $result_set, $this->column_map);
+    $this->assertIdenticalResultset($view, $result_set, $this->column_map);
   }
 
 }
diff --git a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
index eec576d..0ad8a10 100644
--- a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
+++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
@@ -60,10 +60,11 @@ protected function setUp() {
       $this->nodes[$i] = $this->drupalCreateNode($edit);
     }
 
+    $view = $this->getView();
     foreach ($this->fields as $key => $field) {
-      $this->view->display_handler->display->display_options['fields'][$field['field_name']]['id'] = $field['field_name'];
-      $this->view->display_handler->display->display_options['fields'][$field['field_name']]['table'] = 'field_data_' . $field['field_name'];
-      $this->view->display_handler->display->display_options['fields'][$field['field_name']]['field'] = $field['field_name'];
+      $view->display_handler->display->display_options['fields'][$field['field_name']]['id'] = $field['field_name'];
+      $view->display_handler->display->display_options['fields'][$field['field_name']]['table'] = 'field_data_' . $field['field_name'];
+      $view->display_handler->display->display_options['fields'][$field['field_name']]['field'] = $field['field_name'];
     }
   }
 
@@ -71,7 +72,7 @@ protected function setUp() {
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_view_fieldapi');
+    return views_get_view('test_view_fieldapi');
   }
 
   public function testFieldRender() {
diff --git a/lib/Drupal/views/Tests/GlossaryTest.php b/lib/Drupal/views/Tests/GlossaryTest.php
index 1b45265..7c7d6bd 100644
--- a/lib/Drupal/views/Tests/GlossaryTest.php
+++ b/lib/Drupal/views/Tests/GlossaryTest.php
@@ -46,7 +46,7 @@ public function testGlossaryView() {
     }
 
     // Execute glossary view
-    $view = views_get_view('glossary');
+    $view = $this->getView();
     $view->setDisplay('attachment');
     $view->executeDisplay('attachment');
 
@@ -57,4 +57,11 @@ public function testGlossaryView() {
     }
   }
 
+  /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('glossary');
+  }
+
 }
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
index d2a2e55..d488537 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
@@ -35,7 +35,7 @@ function testGlossary() {
       }
     }
 
-    $view = $this->createViewFromConfig('test_glossary');
+    $view = $this->getView();
     $this->executeView($view);
 
     $count_field = 'nid';
@@ -52,4 +52,11 @@ function testGlossary() {
     }
   }
 
+  /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('test_glossary');
+  }
+
 }
diff --git a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
index 0c122a7..e7dbb63 100644
--- a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
@@ -33,19 +33,14 @@ function setUp() {
     );
   }
 
-  protected function getBasicView() {
-    $view = parent::getBasicView();
+  public function testFilterCombineContains() {
+    $view = $this->getView();
     $view->display['default']->display_options['fields']['job'] = array(
       'id' => 'job',
       'table' => 'views_test',
       'field' => 'job',
       'relationship' => 'none',
     );
-    return $view;
-  }
-
-  public function testFilterCombineContains() {
-    $view = $this->getView();
 
     // Change the filtering.
     $view->display['default']->handler->overrideOption('filters', array(
diff --git a/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index 226bce3..241928a 100644
--- a/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -45,7 +45,7 @@ function setUp() {
    * Test the general offset functionality.
    */
   function testOffset() {
-    $saved_view = $this->createViewFromConfig('test_filter_date_between');
+    $saved_view = $this->getView();
 
     // Test offset for simple operator.
     $view = $this->getView($saved_view);
@@ -77,7 +77,7 @@ function testOffset() {
    * Tests the filter operator between/not between.
    */
   function testBetween() {
-    $saved_view = $this->createViewFromConfig('test_filter_date_between');
+    $saved_view = $this->getView();
 
     // Test between with min and max.
     $view = $this->getView($saved_view);
@@ -135,7 +135,7 @@ function testBetween() {
    * Make sure the validation callbacks works.
    */
   function testUiValidation() {
-    $view = $this->createViewFromConfig('test_filter_date_between');
+    $view = $this->getView();
     $view->save();
 
     $this->drupalLogin($this->drupalCreateUser(array('administer views', 'administer site configuration')));
@@ -150,4 +150,11 @@ function testUiValidation() {
     $this->assertText(t('Invalid date format.'), 'Make sure that validation is runned and the invalidate date format is identified.');
   }
 
+  /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('test_filter_date_between');
+  }
+
 }
diff --git a/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
index 6099a8c..300ae44 100644
--- a/lib/Drupal/views/Tests/Handler/FilterStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
@@ -67,17 +67,6 @@ protected function dataSet() {
     return $dataset;
   }
 
-  protected function getBasicView() {
-    $view = parent::getBasicView();
-    $view->display['default']->options['fields']['description'] = array(
-      'id' => 'description',
-      'table' => 'views_test',
-      'field' => 'description',
-      'relationship' => 'none',
-    );
-    return $view;
-  }
-
   function testFilterStringEqual() {
     $view = $this->getView();
 
diff --git a/lib/Drupal/views/Tests/Plugin/AccessTest.php b/lib/Drupal/views/Tests/Plugin/AccessTest.php
index 226f8f2..ae1d3e3 100644
--- a/lib/Drupal/views/Tests/Plugin/AccessTest.php
+++ b/lib/Drupal/views/Tests/Plugin/AccessTest.php
@@ -40,7 +40,7 @@ protected function setUp() {
    * Tests none access plugin.
    */
   function testAccessNone() {
-    $view = $this->createViewFromConfig('test_access_none');
+    $view = views_get_view('test_access_none');
 
     $this->assertTrue($view->display_handler->access($this->admin_user), t('Admin-Account should be able to access the view everytime'));
     $this->assertTrue($view->display_handler->access($this->web_user));
@@ -51,7 +51,7 @@ function testAccessNone() {
    * Tests perm access plugin.
    */
   function testAccessPerm() {
-    $view = $this->createViewFromConfig('test_access_perm');
+    $view = views_get_view('test_access_perm');
 
     $access_plugin = $view->display_handler->getPlugin('access');
 
@@ -64,7 +64,7 @@ function testAccessPerm() {
    * Tests role access plugin.
    */
   function testAccessRole() {
-    $view = $this->createViewFromConfig('test_access_role');
+    $view = views_get_view('test_access_role');
 
     $view->display['default']->handler->options['access']['role'] = array(
       $this->normal_role => $this->normal_role,
@@ -85,7 +85,7 @@ function testAccessRole() {
    * Tests static access check.
    */
   function testStaticAccessPlugin() {
-    $view = $this->createViewFromConfig('test_access_static');
+    $view = views_get_view('test_access_static');
 
     $access_plugin = $view->display_handler->getPlugin('access');
 
@@ -111,7 +111,7 @@ function testStaticAccessPlugin() {
    * Tests dynamic access plugin.
    */
   function testDynamicAccessPlugin() {
-    $view = $this->createViewFromConfig('test_access_dynamic');
+    $view = views_get_view('test_access_dynamic');
     $argument1 = $this->randomName();
     $argument2 = $this->randomName();
     variable_set('test_dynamic_access_argument1', $argument1);
diff --git a/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php b/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
index 954cb68..8553234 100644
--- a/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
+++ b/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
@@ -99,7 +99,7 @@ function testArgumentDefaultFixed() {
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    $view = $this->createViewFromConfig('test_argument_default_fixed');
+    $view = views_get_view('test_argument_default_fixed');
     $view->display['default']->display_options['arguments']['null']['default_argument_options']['argument'] = $this->random;
     return $view;
   }
diff --git a/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
index fca3dad..7d62acd 100644
--- a/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
+++ b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
@@ -22,7 +22,7 @@ public static function getInfo() {
 
   function testArgumentValidatePhp() {
     $string = $this->randomName();
-    $view = $this->createViewFromConfig('test_view_argument_validate_php');
+    $view = views_get_view('test_view_argument_validate_php');
     $view->display['default']->handler->options['arguments']['null']['validate_options']['code'] = 'return $argument == \''. $string .'\';';
 
     $view->preExecute();
@@ -34,7 +34,7 @@ function testArgumentValidatePhp() {
   }
 
   function testArgumentValidateNumeric() {
-    $view = $this->createViewFromConfig('test_view_argument_validate_numeric');
+    $view = views_get_view('test_view_argument_validate_numeric');
     $view->preExecute();
     $view->initHandlers();
     $this->assertFalse($view->argument['null']->validateArgument($this->randomString()));
diff --git a/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php b/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
index 417126c..ec9dad9 100644
--- a/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
+++ b/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
@@ -34,11 +34,18 @@ protected function setUp() {
    * Checks the behavior of the page for access denied/not found behaviours.
    */
   public function testPageResponses() {
-    $view = views_get_view('test_page_display');
+    $view = $this->getView();
     $this->drupalGet('test_page_display_403');
     $this->assertResponse(403);
     $this->drupalGet('test_page_display_404');
     $this->assertResponse(404);
   }
 
+  /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('test_page_display');
+  }
+
 }
diff --git a/lib/Drupal/views/Tests/Plugin/DisplayTest.php b/lib/Drupal/views/Tests/Plugin/DisplayTest.php
index 90d6432..39d0322 100644
--- a/lib/Drupal/views/Tests/Plugin/DisplayTest.php
+++ b/lib/Drupal/views/Tests/Plugin/DisplayTest.php
@@ -24,7 +24,7 @@ public static function getInfo() {
    * Tests the overriding of filter_groups.
    */
   function testFilterGroupsOverriding() {
-    $view = $this->createViewFromConfig('test_filter_groups');
+    $view = views_get_view('test_filter_groups');
     $view->initDisplay();
 
     // mark is as overridden, yes FALSE, means overridden.
diff --git a/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
index e887894..9c24432 100644
--- a/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
+++ b/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
@@ -49,7 +49,7 @@ public function testRenameResetButton() {
     // Look at the page and check the label "reset".
     $this->drupalGet('test_rename_reset_button');
     // Rename the label of the reset button.
-    $view = views_get_view('test_rename_reset_button');
+    $view = $this->getView();
     $view->setDisplay();
 
     $exposed_form = $view->display_handler->getOption('exposed_form');
@@ -178,4 +178,11 @@ function testExposedAdminUi() {
     $this->assertFieldById('edit-options-expose-label', '', t('Make sure a label field is shown'));
   }
 
+  /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('test_rename_reset_button');
+  }
+
 }
diff --git a/lib/Drupal/views/Tests/Plugin/FilterTest.php b/lib/Drupal/views/Tests/Plugin/FilterTest.php
index 08ed20f..f2b112e 100644
--- a/lib/Drupal/views/Tests/Plugin/FilterTest.php
+++ b/lib/Drupal/views/Tests/Plugin/FilterTest.php
@@ -55,7 +55,7 @@ public function testFilterQuery() {
     $plugin = views_get_plugin('filter', 'test_filter');
     $this->assertTrue($plugin instanceof FilterPlugin, 'Test filter plugin found.');
 
-    $view = views_get_view('test_filter');
+    $view = $this->getView();
     $view->initDisplay();
 
     // Change the filtering.
@@ -141,4 +141,11 @@ public function testFilterQuery() {
     $this->assertEqual(count($view->result), 5, format_string('All @count results returned', array('@count' => count($view->display))));
   }
 
+  /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('test_filter');
+  }
+
 }
diff --git a/lib/Drupal/views/Tests/Plugin/PagerTest.php b/lib/Drupal/views/Tests/Plugin/PagerTest.php
index 3f2f37d..6a438b9 100644
--- a/lib/Drupal/views/Tests/Plugin/PagerTest.php
+++ b/lib/Drupal/views/Tests/Plugin/PagerTest.php
@@ -56,7 +56,7 @@ public function testStorePagerSettings() {
     $this->assertText('Mini', 'Changed pager plugin, should change some text');
 
     // Test behaviour described in http://drupal.org/node/652712#comment-2354400
-    $view = $this->createViewFromConfig('test_store_pager_settings');
+    $view = views_get_view('test_store_pager_settings');
     // Make it editable in the admin interface.
     $view->save();
 
@@ -137,16 +137,17 @@ public function testNoLimit() {
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_pager_none');
+    return views_get_view('test_pager_full');
   }
 
   public function testViewTotalRowsWithoutPager() {
     $this->createNodes(23);
+    $views = views_get_view('test_pager_none');
 
-    $this->view->get_total_rows = TRUE;
-    $this->executeView($this->view);
+    $view->get_total_rows = TRUE;
+    $this->executeView($view);
 
-    $this->assertEqual($this->view->total_rows, 23, "'total_rows' is calculated when pager type is 'none' and 'get_total_rows' is TRUE.");
+    $this->assertEqual($view->total_rows, 23, "'total_rows' is calculated when pager type is 'none' and 'get_total_rows' is TRUE.");
   }
 
   public function createNodes($count) {
@@ -161,19 +162,18 @@ public function createNodes($count) {
    * Tests the some pager plugin.
    */
   public function testLimit() {
-    $saved_view = $this->createViewFromConfig('test_pager_some');
+    $view = views_get_view('test_pager_some');
 
     // Create 11 nodes and make sure that everyone is returned.
     // We create 11 nodes, because the default pager plugin had 10 items per page.
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
-    $view = $saved_view->cloneView();
     $this->executeView($view);
     $this->assertEqual(count($view->result), 5, 'Make sure that only a certain count of items is returned');
 
     // Setup and test a offset.
-    $view = $this->getView($saved_view);
+    $view = $this->getView($view);
 
     $pager = array(
       'type' => 'none',
@@ -195,19 +195,18 @@ public function testLimit() {
    * Tests the normal pager.
    */
   public function testNormalPager() {
-    $saved_view = $this->createViewFromConfig('test_pager_full');
+    $view = $this->getView();
 
     // Create 11 nodes and make sure that everyone is returned.
     // We create 11 nodes, because the default pager plugin had 10 items per page.
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
-    $view = $saved_view->cloneView();
     $this->executeView($view);
     $this->assertEqual(count($view->result), 5, 'Make sure that only a certain count of items is returned');
 
     // Setup and test a offset.
-    $view = $this->getView($saved_view);
+    $view = $this->getView($view);
 
     $pager = array(
       'type' => 'full',
@@ -221,7 +220,7 @@ public function testNormalPager() {
     $this->assertEqual(count($view->result), 3, 'Make sure that only a certain count of items is returned');
 
     // Test items per page = 0
-    $view = $this->createViewFromConfig('test_view_pager_full_zero_items_per_page');
+    $view = views_get_view('test_view_pager_full_zero_items_per_page');
     $this->executeView($view);
 
     $this->assertEqual(count($view->result), 11, 'All items are return');
@@ -230,7 +229,7 @@ public function testNormalPager() {
 
     // Test items per page = 0.
     // Setup and test a offset.
-    $view = $this->getView($saved_view);
+    $view = $this->getView($view);
 
     $pager = array(
       'type' => 'full',
@@ -262,7 +261,8 @@ public function testRenderNullPager() {
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
-    $view = $this->createViewFromConfig('test_pager_full');
+
+    $view = $this->getView();
     $this->executeView($view);
     $view->use_ajax = TRUE; // force the value again here
     $view->pager = NULL;
@@ -274,7 +274,7 @@ public function testRenderNullPager() {
    * Test the api functions on the view object.
    */
   function testPagerApi() {
-    $view = $this->createViewFromConfig('test_pager_full');
+    $view = $this->getView();
     // On the first round don't initialize the pager.
 
     $this->assertEqual($view->getItemsPerPage(), NULL, 'If the pager is not initialized and no manual override there is no items per page.');
diff --git a/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php b/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php
index e341022..3bcba9a 100644
--- a/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php
+++ b/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php
@@ -24,7 +24,7 @@ public static function getInfo() {
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_style_mapping');
+    return views_get_view('test_style_mapping');
   }
 
   /**
diff --git a/lib/Drupal/views/Tests/Plugin/StyleTest.php b/lib/Drupal/views/Tests/Plugin/StyleTest.php
index 8e13650..939ca9f 100644
--- a/lib/Drupal/views/Tests/Plugin/StyleTest.php
+++ b/lib/Drupal/views/Tests/Plugin/StyleTest.php
@@ -26,7 +26,7 @@ public static function getInfo() {
    * Tests the grouping legacy features of styles.
    */
   function testGroupingLegacy() {
-    $view = $this->view->cloneView();
+    $view = $this->getView();
     // Setup grouping by the job.
     $view->initDisplay();
     $view->initStyle();
@@ -241,7 +241,7 @@ function _testGrouping($stripped = FALSE) {
    * Tests custom css classes.
    */
   function testCustomRowClasses() {
-    $view = $this->view->cloneView();
+    $view = $this->getView();
 
     // Setup some random css class.
     $view->initDisplay();
diff --git a/lib/Drupal/views/Tests/QueryGroupByTest.php b/lib/Drupal/views/Tests/QueryGroupByTest.php
index d3d2191..c24534b 100644
--- a/lib/Drupal/views/Tests/QueryGroupByTest.php
+++ b/lib/Drupal/views/Tests/QueryGroupByTest.php
@@ -43,7 +43,7 @@ public function testAggregateCount() {
     $this->drupalCreateNode($node_2);
     $this->drupalCreateNode($node_2);
 
-    $view = $this->createViewFromConfig('test_aggregate_count');
+    $view = views_get_view('test_aggregate_count');
     $this->executeView($view);
 
     $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
@@ -86,7 +86,7 @@ function GroupByTestHelper($group_by, $values) {
     $this->drupalCreateNode($node_2);
     $this->drupalCreateNode($node_2);
 
-    $view = $this->createViewFromConfig('test_group_by_count');
+    $view = views_get_view('test_group_by_count');
     $view->display['default']->handler->options['fields']['nid']['group_type'] = $group_by;
     $this->executeView($view);
 
@@ -133,17 +133,11 @@ public function testGroupByCountOnlyFilters() {
       $this->drupalCreateNode($node_1);
     }
 
-    $this->executeView($this->view);
-
-    $this->assertTrue(strpos($this->view->build_info['query'], 'GROUP BY'), t('Make sure that GROUP BY is in the query'));
-    $this->assertTrue(strpos($this->view->build_info['query'], 'HAVING'), t('Make sure that HAVING is in the query'));
-  }
+    $view = views_get_view('test_group_by_in_filters');
+    $this->executeView($view);
 
-  /**
-   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
-   */
-  protected function getBasicView() {
-    return $this->createViewFromConfig('test_group_by_in_filters');
+    $this->assertTrue(strpos($view->build_info['query'], 'GROUP BY'), t('Make sure that GROUP BY is in the query'));
+    $this->assertTrue(strpos($view->build_info['query'], 'HAVING'), t('Make sure that HAVING is in the query'));
   }
 
 }
diff --git a/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php b/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php
index f96cbb1..313c8b2 100644
--- a/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php
+++ b/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php
@@ -62,21 +62,22 @@ function setUp() {
   }
 
   function testViewsHandlerRelationshipNodeTermData() {
-    $this->executeView($this->view, array($this->term_1->tid, $this->term_2->tid));
+    $view = $this->getView();
+    $this->executeView($view, array($this->term_1->tid, $this->term_2->tid));
     $resultset = array(
       array(
         'nid' => $this->node->nid,
       ),
     );
     $this->column_map = array('nid' => 'nid');
-    $this->assertIdenticalResultset($this->view, $resultset, $this->column_map);
+    $this->assertIdenticalResultset($view, $resultset, $this->column_map);
   }
 
   /**
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_taxonomy_node_term_data');
+    return views_get_view('test_taxonomy_node_term_data');
   }
 
 }
diff --git a/lib/Drupal/views/Tests/TranslatableTest.php b/lib/Drupal/views/Tests/TranslatableTest.php
index 8c8e2f8..0cf99cf 100644
--- a/lib/Drupal/views/Tests/TranslatableTest.php
+++ b/lib/Drupal/views/Tests/TranslatableTest.php
@@ -49,15 +49,13 @@ protected function setUp() {
       'fieldlabel1',
       'filterlabel1'
     );
-
-    $this->view = $this->getBasicView();
   }
 
   /**
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_view_unpack_translatable');
+    return views_get_view('test_view_unpack_translatable');
   }
 
   /**
diff --git a/lib/Drupal/views/Tests/UpgradeTestCase.php b/lib/Drupal/views/Tests/UpgradeTestCase.php
index fe2e9c5..193e038 100644
--- a/lib/Drupal/views/Tests/UpgradeTestCase.php
+++ b/lib/Drupal/views/Tests/UpgradeTestCase.php
@@ -66,8 +66,7 @@ function debugField($field) {
    */
   public function testMovedTo() {
     // Test moving on field lavel.
-    $view = $this->createViewFromConfig('test_views_move_to_field');
-    $view->update();
+    $view = views_get_view('test_views_move_to_field');
     $view->build();
 
 //     $this->assertEqual('old_field_1', $view->field['old_field_1']->options['id'], "Id shouldn't change during conversion");
@@ -77,8 +76,7 @@ public function testMovedTo() {
     $this->assertEqual('old_field_1', $view->field['old_field_1']->original_field, 'The field should have stored the original_field');
 
     // Test moving on handler lavel.
-    $view = $this->createViewFromConfig('test_views_move_to_handler');
-    $view->update();
+    $view = views_get_view('test_views_move_to_handler');
     $view->build();
 
 //     $this->assertEqual('old_field_2', $view->field['old_field_2']->options['id']);
@@ -90,8 +88,7 @@ public function testMovedTo() {
     $this->assertEqual('views_test', $view->filter['old_field_3']->table);
 
     // Test moving on table level.
-    $view = $this->createViewFromConfig('test_views_move_to_table');
-    $view->update();
+    $view = views_get_view('test_views_move_to_table');
     $view->build();
 
     $this->assertEqual('views_test', $view->base_table, 'Make sure that view->base_table gets automatically converted.');
diff --git a/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php b/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php
index bdaf382..420b7b0 100644
--- a/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php
+++ b/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php
@@ -31,10 +31,11 @@ public function test_plugin_argument_default_current_user() {
     drupal_save_session(FALSE);
     $user = $account;
 
-    $this->view->preExecute();
-    $this->view->initHandlers();
+    $view = $this->getView();
+    $view->preExecute();
+    $view->initHandlers();
 
-    $this->assertEqual($this->view->argument['null']->get_default_argument(), $account->uid, 'Uid of the current user is used.');
+    $this->assertEqual($view->argument['null']->get_default_argument(), $account->uid, 'Uid of the current user is used.');
     // Switch back.
     $user = $admin;
     drupal_save_session(TRUE);
@@ -44,7 +45,7 @@ public function test_plugin_argument_default_current_user() {
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_plugin_argument_default_current_user');
+    return views_get_view('test_plugin_argument_default_current_user');
   }
 
 }
diff --git a/lib/Drupal/views/Tests/User/ArgumentValidateTest.php b/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
index 73487ec..0a20dfb 100644
--- a/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
+++ b/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
@@ -76,12 +76,18 @@ function testArgumentValidateUserEither() {
   }
 
   function view_argument_validate_user($argtype) {
-    $view = $this->createViewFromConfig('test_view_argument_validate_user');
+    $view = $this->getView();
     $view->display['default']->handler->options['arguments']['null']['validate_options']['type'] = $argtype;
     $view->preExecute();
     $view->initHandlers();
-
     return $view;
   }
 
+  /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('test_view_argument_validate_user');
+  }
+
 }
diff --git a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
index 7a28fef..c87a928 100644
--- a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
+++ b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
@@ -57,7 +57,7 @@ function testUserName() {
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_views_handler_field_user_name');
+    return views_get_view('test_views_handler_field_user_name');
   }
 
 }
diff --git a/lib/Drupal/views/Tests/User/UserTest.php b/lib/Drupal/views/Tests/User/UserTest.php
index 5ba6320..7c09266 100644
--- a/lib/Drupal/views/Tests/User/UserTest.php
+++ b/lib/Drupal/views/Tests/User/UserTest.php
@@ -44,14 +44,20 @@ protected function setUp() {
   }
 
   /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('test_user_relationship');
+  }
+
+  /**
    * Add a view which has no explicit relationship to the author and check the result.
    *
    * @todo: Remove the following comment once the relationship is required.
    * One day a view will require the relationship so it should still work
    */
   public function testRelationship() {
-    $view = $this->createViewFromConfig('test_user_relationship');
-
+    $view = $this->getView();
     $this->executeView($view);
     $expected = array();
     for ($i = 0; $i <= 1; $i++) {
diff --git a/lib/Drupal/views/Tests/ViewStorageTest.php b/lib/Drupal/views/Tests/ViewStorageTest.php
index 7d3aee6..df18858 100644
--- a/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -132,7 +132,7 @@ protected function loadTests() {
     $this->assertIdentical(array_keys($all_configuration_entities), array_map($prefix_map, $all_config), 'All loaded elements match.');
 
     // Make sure that loaded default views get a uuid.
-    $view = views_get_view('frontpage');
+    $view = $this->getView();
     $this->assertTrue($view->uuid());
   }
 
@@ -295,4 +295,11 @@ protected function loadView($view_name) {
     return reset($load);
   }
 
+  /**
+   * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
+   */
+  protected function getBasicView() {
+    return views_get_view('frontpage');
+  }
+
 }
diff --git a/lib/Drupal/views/Tests/ViewTest.php b/lib/Drupal/views/Tests/ViewTest.php
index bc9fbe7..3a6fe58 100644
--- a/lib/Drupal/views/Tests/ViewTest.php
+++ b/lib/Drupal/views/Tests/ViewTest.php
@@ -72,11 +72,12 @@ function testValidate() {
     // Test a view with multiple displays.
     // Validating a view shouldn't change the active display.
     // @todo: Create an extra validation view.
-    $this->view->setDisplay('page_1');
+    $view = $this->getView();
+    $view->setDisplay('page_1');
 
-    $this->view->validate();
+    $view->validate();
 
-    $this->assertEqual('page_1', $this->view->current_display, "The display should be constant while validating");
+    $this->assertEqual('page_1', $view->current_display, "The display should be constant while validating");
 
     // @todo: Write real tests for the validation.
     // In general the following things could be tested:
@@ -88,7 +89,7 @@ function testValidate() {
    * Overrides Drupal\views\Tests\ViewTestBase::getBasicView().
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_destroy');
+    return views_get_view('test_destroy');
   }
 
 }
diff --git a/lib/Drupal/views/Tests/ViewTestBase.php b/lib/Drupal/views/Tests/ViewTestBase.php
index 074e67c..05eebbe 100644
--- a/lib/Drupal/views/Tests/ViewTestBase.php
+++ b/lib/Drupal/views/Tests/ViewTestBase.php
@@ -17,7 +17,7 @@
    *
    * @var array
    */
-  public static $modules = array('views');
+  public static $modules = array('views', 'views_test_config');
 
   /**
    * The view to use for the test.
@@ -33,8 +33,6 @@ protected function setUp() {
     views_init();
     views_get_all_views(TRUE);
     menu_router_rebuild();
-
-    $this->view = $this->getBasicView();
   }
 
 
@@ -61,9 +59,6 @@ protected function enableViewsTestModule() {
     }
     $query->execute();
     $this->checkPermissions(array(), TRUE);
-
-    // Reset the test view, in case it was dependent on the test data module.
-    $this->view = $this->getBasicView();
   }
 
   /**
@@ -393,29 +388,7 @@ protected function dataSet() {
    * @return Drupal\views\View
    */
   protected function getBasicView() {
-    return $this->createViewFromConfig('test_view');
-  }
-
-  /**
-   * Creates a new View instance by creating directly from config data.
-   *
-   * @param string $view_name
-   *   The name of the test view to create.
-   *
-   * @return Drupal\views\View
-   *   A View instance.
-   */
-  protected function createViewFromConfig($view_name) {
-    if (!module_exists('views_test_config')) {
-      module_enable(array('views_test_config'));
-    }
-
-    $data = config("views.view.$view_name")->get();
-
-    $view = entity_create('view', $data);
-    $view->setDisplay();
-
-    return $view;
+    return views_get_view('test_view');
   }
 
   /**
@@ -433,7 +406,7 @@ protected function getView($original_view = NULL) {
       $view = $original_view->cloneView();
     }
     else {
-      $view = $this->view->cloneView();
+      $view = $this->getBasicView()->cloneView();
     }
     $view->setDisplay();
     return $view;