diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
index 8408aa4..f28870b 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -54,11 +54,12 @@ class ViewStorageTest extends ViewTestBase {
   protected $controller;
 
   /**
-   * Modules to enable.
-   *
-   * @var array
+   * The variable which stores the view name to test against
+   * 
+   * @var string
    */
-  public static $modules = array('node', 'search', 'comment', 'taxonomy');
+
+  protected $viewName = 'test_view_storage';
 
   public static function getInfo() {
     return array(
@@ -96,8 +97,8 @@ function testConfigurationEntityCRUD() {
    * Tests loading configuration entities.
    */
   protected function loadTests() {
-    $view = $this->loadView('archive');
-    $data = config('views.view.archive')->get();
+    $view = $this->loadView($this->viewName);
+    $data = config('views.view.' . $this->viewName)->get();
 
     // Confirm that an actual view object is loaded and that it returns all of
     // expected properties.
@@ -123,26 +124,8 @@ protected function loadTests() {
       }
     }
 
-    // Fetch data for all configuration entities and default view configurations.
-    $all_configuration_entities = $this->controller->load();
-    $all_config = config_get_storage_names_with_prefix('views.view');
-
-    // Remove the 'views.view.' prefix from config names for comparision with
-    // loaded configuration entities.
-    $prefix_map = function ($value) {
-      $parts = explode('.', $value);
-      return end($parts);
-    };
-
-    // Check that the correct number of configuration entities have been loaded.
-    $count = count($all_configuration_entities);
-    $this->assertEqual($count, count($all_config), format_string('The array of all @count configuration entities is loaded.', array('@count' => $count)));
-
-    // Check that all of these machine names match.
-    $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 = views_get_view($this->viewName);
     $this->assertTrue($view->storage->uuid());
   }
 
@@ -160,7 +143,7 @@ protected function createTests() {
     }
 
     // Create a new View instance with config values.
-    $values = config('views.view.glossary')->get();
+    $values = config('views.view.' . $this->viewName)->get();
     $created = $this->controller->create($values);
 
     $this->assertTrue($created instanceof View, 'Created object is a View.');
@@ -176,9 +159,10 @@ protected function createTests() {
     }
 
     // Check the UUID of the loaded View.
-    $created->set('name', 'glossary_new');
+    $created->set('name', $this->viewName . '_new');
     $created->save();
-    $created_loaded = $this->loadView('glossary_new');
+    $this->viewName = $this->viewName . '_new';
+    $created_loaded = $this->loadView($this->viewName);
     $this->assertIdentical($created->uuid(), $created_loaded->uuid(), 'The created UUID has been saved correctly.');
   }
 
@@ -187,7 +171,7 @@ protected function createTests() {
    */
   protected function displayTests() {
     // Check whether a display can be added and saved to a View.
-    $view = $this->loadView('frontpage');
+    $view = $this->loadView($this->viewName);
 
     $view->newDisplay('page', 'Test', 'test');
 
@@ -197,10 +181,11 @@ protected function displayTests() {
     $this->assertEqual($new_display['test']['display_plugin'], 'page', 'New page display "test" uses the right display plugin.');
     $this->assertTrue($view->get('executable')->displayHandlers[$new_display['test']['id']] instanceof Page, 'New page display "test" uses the right display plugin.');
 
+    $this->viewName = $this->viewName . '_new2';
 
-    $view->set('name', 'frontpage_new');
+    $view->set('name', $this->viewName);
     $view->save();
-    $values = config('views.view.frontpage_new')->get();
+    $values = config('views.view.' . $this->viewName)->get();
 
     $this->assertTrue(isset($values['display']['test']) && is_array($values['display']['test']), 'New display was saved.');
   }
@@ -210,7 +195,7 @@ protected function displayTests() {
    */
   protected function statusTests() {
     // Test a View can be enabled and disabled again (with a new view).
-    $view = $this->loadView('backlinks');
+    $view = $this->loadView($this->viewName);
 
     // The view should already be disabled.
     $view->enable();
@@ -218,7 +203,7 @@ protected function statusTests() {
 
     // Check the saved values.
     $view->save();
-    $config = config('views.view.backlinks')->get();
+    $config = config('views.view.' . $this->viewName)->get();
     $this->assertFalse($config['disabled'], 'The changed disabled property was saved.');
 
     // Disable the view.
@@ -227,7 +212,7 @@ protected function statusTests() {
 
     // Check the saved values.
     $view->save();
-    $config = config('views.view.backlinks')->get();
+    $config = config('views.view.' . $this->viewName)->get();
     $this->assertTrue($config['disabled'], 'The changed disabled property was saved.');
   }
 
diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_storage.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_storage.yml
new file mode 100644
index 0000000..c28829f
--- /dev/null
+++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_storage.yml
@@ -0,0 +1,53 @@
+api_version: '3.0'
+base_table: views_test_data
+core: '8'
+module: views
+description: 'Storage Test View for testing.'
+disabled: true
+display:
+  default:
+    display_options:
+      defaults:
+        fields: '0'
+        pager: '0'
+        pager_options: '0'
+        sorts: '0'
+      fields:
+        id:
+          field: id
+          id: id
+          relationship: none
+          table: views_test_data
+      sorts:
+        id:
+          field: id
+          id: id
+          order: ASC
+          relationship: none
+          table: views_test_data
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: '0'
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: '1'
+    display_options:
+      query:
+        type: views_query
+        options: {  }
+      path: test_view_storage
+  block_1:
+    id: block_1
+    display_title: Block
+    display_plugin: block
+    position: '2'
+    display_options:
+      query:
+        type: views_query
+        options: {  }
+human_name: 'Storage Test View'
+name: test_view_storage
+tag: 'test'