diff --git a/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php b/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php
index b002106..1840218 100644
--- a/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php
+++ b/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php
@@ -81,7 +81,7 @@ public function testFieldComponent() {
     $default_widget = $field_type_info['default_widget'];
     $widget_settings = \Drupal::service('plugin.manager.field.widget')->getDefaultSettings($default_widget);
     $expected = array(
-      'weight' => 0,
+      'weight' => 3,
       'type' => $default_widget,
       'settings' => $widget_settings,
       'third_party_settings' => array(),
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php
index c58f9d2..dc46e90 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php
@@ -109,10 +109,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
           'placeholder' => '',
         ),
       ));
-    if (isset($fields['langcode'])) {
-      $fields['langcode']->setDisplayOptions('view', []);
-      $fields['langcode']->setDisplayOptions('form', []);
-    }
 
     return $fields;
   }