core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php       | 5 ++++-
 .../test_views/views.view.test_entity_type_filter.yml                | 1 -
 .../test_views/views.view.test_page_display_menu.yml                 | 4 ++--
 core/modules/views_ui/src/Tests/DisplayPathTest.php                  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php b/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php
index cde6f75..f5f2d7a 100644
--- a/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php
+++ b/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Entity;
 
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Views;
 
 /**
@@ -46,11 +47,13 @@ class FilterEntityBundleTest extends ViewTestBase {
   protected $entities = array();
 
   protected function setUp() {
-    parent::setUp();
+    parent::setUp(FALSE);
 
     $this->drupalCreateContentType(array('type' => 'test_bundle'));
     $this->drupalCreateContentType(array('type' => 'test_bundle_2'));
 
+    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+
     $this->entityBundles = entity_get_bundles('node');
 
     $this->entities['count'] = 0;
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml
index a628e83..fc25a20 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml
@@ -83,7 +83,6 @@ display:
           field: type
           relationship: none
           value:
-            all: all
             test_bundle: test_bundle
             test_bundle_2: test_bundle_2
           plugin_id: bundle
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml
index 7467d36..9a5eb2e 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml
@@ -100,7 +100,7 @@ display:
         title: 'Test child (with parent)'
         parent: system.admin
         description: ''
-        menu_name: tools
+        menu_name: admin
         weight: 0
         context: '0'
       defaults:
@@ -120,7 +120,7 @@ display:
         title: 'Test child with non-existing parent'
         parent: llamasarelame
         description: ''
-        menu_name: tools
+        menu_name: admin
         weight: 0
         context: '0'
       defaults:
diff --git a/core/modules/views_ui/src/Tests/DisplayPathTest.php b/core/modules/views_ui/src/Tests/DisplayPathTest.php
index 144813b..b79c625 100644
--- a/core/modules/views_ui/src/Tests/DisplayPathTest.php
+++ b/core/modules/views_ui/src/Tests/DisplayPathTest.php
@@ -141,11 +141,11 @@ public function testMenuOptions() {
       '-- My account',
       '-- Log out',
       '<Administration>',
+      '-- Test child (with parent)',
       '<Footer>',
       '<Main navigation>',
       '<Tools>',
       '-- Compose tips (disabled)',
-      '-- Test child (with parent)',
       '-- Test menu link',
     ], $menu_options);
   }