diff --git a/core/modules/entity_reference/src/Tests/Views/SelectionTest.php b/core/modules/entity_reference/src/Tests/Views/SelectionTest.php
index db2a698..1fbe5cb 100644
--- a/core/modules/entity_reference/src/Tests/Views/SelectionTest.php
+++ b/core/modules/entity_reference/src/Tests/Views/SelectionTest.php
@@ -60,7 +60,6 @@ public function testSelectionHandler() {
       'settings' => array(
         'handler' => 'views',
         'handler_settings' => array(
-          'target_bundles' => array(),
           'view' => array(
             'view_name' => 'test_entity_reference',
             'display_name' => 'entity_reference_1',
diff --git a/core/modules/field/src/Tests/FormTest.php b/core/modules/field/src/Tests/FormTest.php
index 3466a24..fde1f29 100644
--- a/core/modules/field/src/Tests/FormTest.php
+++ b/core/modules/field/src/Tests/FormTest.php
@@ -596,7 +596,7 @@ function testHiddenField() {
 
     // Update the field to remove the default value, and switch to the default
     // widget.
-    $this->field->default_value = NULL;
+    $this->field->default_value = array();
     $this->field->save();
     entity_get_form_display($entity_type, $this->field->bundle, 'default')
       ->setComponent($this->field->getName(), array(
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
index 10dc015..d32d336 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
@@ -62,7 +62,7 @@ public function getSettings($widget_type, $widget_settings) {
         'placeholder' => '',
       ),
       'link' => array(
-        'placeholder_uri' => '',
+        'placeholder_url' => '',
         'placeholder_title' => '',
       ),
       'filefield_widget' => array(
diff --git a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
index d2a3b18..7128ee4 100644
--- a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
+++ b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
@@ -23,6 +23,4 @@ content:
     third_party_settings: {  }
 hidden:
   langcode: true
-third_party_settings:
-  entity_test:
-    foo: bar
+third_party_settings: {  }
diff --git a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
index a6a9b60..fe1e460 100644
--- a/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
+++ b/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
@@ -25,6 +25,4 @@ content:
     third_party_settings: {  }
 hidden:
   langcode: true
-third_party_settings:
-  entity_test:
-    foo: bar
+third_party_settings: {  }
diff --git a/core/modules/quickedit/src/Tests/QuickEditTestBase.php b/core/modules/quickedit/src/Tests/QuickEditTestBase.php
index 78c3eed..1536194 100644
--- a/core/modules/quickedit/src/Tests/QuickEditTestBase.php
+++ b/core/modules/quickedit/src/Tests/QuickEditTestBase.php
@@ -22,7 +22,7 @@
    * @var bool
    */
   protected $strictConfigSchema = TRUE;
-  
+
   /**
    * Modules to enable.
    *
@@ -101,7 +101,6 @@ protected function createFieldWithStorage($field_name, $type, $cardinality, $lab
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
         'type' => $widget_type,
-        'label' => $label,
         'settings' => $widget_settings,
       ))
       ->save();
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
index ea980b1..4c8269a 100644
--- a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
@@ -90,7 +90,9 @@ protected function setUp() {
       'type' => 'taxonomy_term_reference',
       'settings' => array(
         'allowed_values' => array(
-          'vocabulary' => $vocabulary->id(),
+          array(
+            'vocabulary' => $vocabulary->id(),
+          ),
         ),
       ),
     ))->save();