diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
index 408b2430c88ce34dbae26484b31e2c2609abd90c..f83a875d0cccc35c36871e4ae3572508a6b7e8c9 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
@@ -19,7 +19,7 @@ class DisplayFeedTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_feed_display');
+  public static $testViews = array('test_display_feed');
 
   /**
    * Modules to enable.
@@ -52,7 +52,7 @@ public function testFeedUI() {
     $this->drupalGet('admin/structure/views');
 
     // Check the attach TO interface.
-    $this->drupalGet('admin/structure/views/nojs/display/test_feed_display/feed_1/displays');
+    $this->drupalGet('admin/structure/views/nojs/display/test_display_feed/feed_1/displays');
 
     // Load all the options of the checkbox.
     $result = $this->xpath('//div[@id="edit-displays"]/div');
@@ -68,13 +68,13 @@ public function testFeedUI() {
     $this->assertEqual($options, array('default', 'page'), 'Make sure all displays appears as expected.');
 
     // Post and save this and check the output.
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_feed_display/feed_1/displays', array('displays[page]' => 'page'), t('Apply'));
-    $this->drupalGet('admin/structure/views/view/test_feed_display/edit/feed_1');
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_display_feed/feed_1/displays', array('displays[page]' => 'page'), t('Apply'));
+    $this->drupalGet('admin/structure/views/view/test_display_feed/edit/feed_1');
     $this->assertFieldByXpath('//*[@id="views-feed-1-displays"]', 'Page');
 
     // Add the default display, so there should now be multiple displays.
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_feed_display/feed_1/displays', array('displays[default]' => 'default'), t('Apply'));
-    $this->drupalGet('admin/structure/views/view/test_feed_display/edit/feed_1');
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_display_feed/feed_1/displays', array('displays[default]' => 'default'), t('Apply'));
+    $this->drupalGet('admin/structure/views/view/test_display_feed/edit/feed_1');
     $this->assertFieldByXpath('//*[@id="views-feed-1-displays"]', 'Multiple displays');
   }
 
@@ -92,14 +92,14 @@ public function testFeedOutput() {
     $result = $this->xpath('//title');
     $this->assertEqual($result[0], $site_name, 'The site title is used for the feed title.');
 
-    $view = $this->container->get('entity.manager')->getStorageController('view')->load('test_feed_display');
+    $view = $this->container->get('entity.manager')->getStorageController('view')->load('test_display_feed');
     $display = &$view->getDisplay('feed_1');
     $display['display_options']['sitename_title'] = 0;
     $view->save();
 
     $this->drupalGet('test-feed-display.xml');
     $result = $this->xpath('//title');
-    $this->assertEqual($result[0], 'test_feed_display', 'The display title is used for the feed title.');
+    $this->assertEqual($result[0], 'test_display_feed', 'The display title is used for the feed title.');
   }
 
 }
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml
similarity index 89%
rename from core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml
rename to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml
index 1c82fa3601b7d06ddd1be26f4bb551b2cc09a51b..d4ece5df96347782441b50e0331f38bb695c23af 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml
@@ -1,7 +1,7 @@
 base_table: node
-core: 8.0-dev
+core: 8
 description: ''
-status: '1'
+status: true
 display:
   default:
     display_options:
@@ -44,7 +44,7 @@ display:
           provider: views
       pager:
         options:
-          items_per_page: '10'
+          items_per_page: 10
         type: full
       query:
         type: views_query
@@ -64,11 +64,11 @@ display:
           provider: views
       style:
         type: default
-      title: test_feed_display
+      title: test_display_feed
     display_plugin: default
     display_title: Master
     id: default
-    position: '0'
+    position: 0
   feed_1:
     display_options:
       displays: {  }
@@ -79,19 +79,19 @@ display:
         type: node_rss
       style:
         type: rss
-      sitename_title: '1'
+      sitename_title: true
     display_plugin: feed
     display_title: Feed
     id: feed_1
-    position: '0'
+    position: 0
   page:
     display_options:
       path: test-feed-display
     display_plugin: page
     display_title: Page
     id: page
-    position: '0'
-label: test_feed_display
+    position: 0
+label: test_display_feed
 module: views
-id: test_feed_display
+id: test_display_feed
 tag: default