diff --git a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php b/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
index d8a0b56..b7ece54 100644
--- a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
+++ b/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
@@ -100,13 +100,14 @@ protected function createBlock($plugin_id, array $settings = array()) {
         'max_age' => 0,
       ),
     );
-    foreach (array('region', 'id', 'theme', 'plugin', 'weight') as $key) {
+    $values = [];
+    foreach (array('region', 'id', 'theme', 'plugin', 'weight', 'visibility') as $key) {
       $values[$key] = $settings[$key];
       // Remove extra values that do not belong in the settings array.
       unset($settings[$key]);
     }
-    foreach ($settings['visibility'] as $id => $visibility) {
-      $settings['visibility'][$id]['id'] = $id;
+    foreach ($values['visibility'] as $id => $visibility) {
+      $values['visibility'][$id]['id'] = $id;
     }
     $values['settings'] = $settings;
     $block = entity_create('block', $values);
diff --git a/core/modules/views/src/Tests/Plugin/DisplayTest.php b/core/modules/views/src/Tests/Plugin/DisplayTest.php
index 7ffb84d..e27e650 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayTest.php
@@ -84,9 +84,9 @@ public function testDisplayPlugin() {
     // Move the second display before the first one in order to test custom
     // sorting.
     $displays['display_test_1']['position'] = 2;
-    $displays['display_test_1']['display_plugin'] = 'page';
+    $displays['display_test_1']['display_plugin'] = 'display_test';
     $displays['display_test_2']['position'] = 1;
-    $displays['display_test_2']['display_plugin'] = 'page';
+    $displays['display_test_2']['display_plugin'] = 'display_test';
     $view->storage->set('display', $displays);
     $view->save();
 
diff --git a/core/modules/views_ui/src/Tests/CustomBooleanTest.php b/core/modules/views_ui/src/Tests/CustomBooleanTest.php
index 555f81e..d61a907 100644
--- a/core/modules/views_ui/src/Tests/CustomBooleanTest.php
+++ b/core/modules/views_ui/src/Tests/CustomBooleanTest.php
@@ -30,7 +30,6 @@ class CustomBooleanTest extends UITestBase {
   public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['age']['field']['id'] = 'boolean';
-    $data['views_test_data']['age']['field']['plugin_id'] = 'boolean';
     return $data;
   }
 
@@ -58,6 +57,7 @@ public function testCustomOption() {
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
+        'plugin_id' => 'boolean',
       ),
     ));
 
diff --git a/core/modules/views_ui/src/Tests/QueryTest.php b/core/modules/views_ui/src/Tests/QueryTest.php
index db8bed2..fb0b9fb 100644
--- a/core/modules/views_ui/src/Tests/QueryTest.php
+++ b/core/modules/views_ui/src/Tests/QueryTest.php
@@ -39,6 +39,11 @@ protected function viewsData() {
    * Tests query plugins settings.
    */
   public function testQueryUI() {
+    $view = Views::getView('test_view');
+    $display = &$view->getDisplay('default');
+    $display['display_options']['query']['type'] = 'query_test';
+    $view->save();
+
     // Save some query settings.
     $query_settings_path = "admin/structure/views/nojs/display/test_view/default/query";
     $random_value = $this->randomMachineName();