diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUICoreFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUICoreFieldsTest.php
index 9cd3635..1b67199 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUICoreFieldsTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUICoreFieldsTest.php
@@ -43,12 +43,14 @@ public function setUp() {
    * Ensures that entity types with bundles do not break following entity types.
    */
   public function testFieldUICoreFields() {
-    entity_test_create_bundle('test_bundle', 'Test bundle', 'entity_test_base_field_display');
+    entity_test_create_bundle('test_bundle');
     // Make sure field found in manage view and form display.
-    $this->drupalGet('entity_test_base_field_display/structure/test_bundle/display');
-    $this->assertText(t('Field with configurable display'));
-    $this->drupalGet('entity_test_base_field_display/structure/test_bundle/form-display');
-    $this->assertText(t('Field with configurable display'));
+    $this->drupalGet('entity_test/structure/test_bundle/display');
+    $this->assertText(t('Name'));
+    $this->assertField('fields[name][type]');
+    $this->drupalGet('entity_test/structure/test_bundle/form-display');
+    $this->assertText(t('Name'));
+    $this->assertField('fields[name][type]');
   }
 
 }
diff --git a/core/modules/field_ui/tests/modules/field_ui_test/field_ui_test.module b/core/modules/field_ui/tests/modules/field_ui_test/field_ui_test.module
index 74b01b0..95d2dc4 100644
--- a/core/modules/field_ui/tests/modules/field_ui_test/field_ui_test.module
+++ b/core/modules/field_ui/tests/modules/field_ui_test/field_ui_test.module
@@ -13,3 +13,44 @@ function field_ui_test_field_info_alter(&$info) {
   $info['string']['default_formatter'] = 'text_plain';
   $info['string']['default_widget'] = 'text_textfield';
 }
+
+/**
+ * Implements hook_field_formatter_info_alter().
+ */
+function field_ui_test_field_formatter_info_alter(&$info) {
+  // Allow formatter for the string field type.
+  if (isset($info['text_plain'])) {
+    $info['text_plain']['field_types'][] = 'string';
+  }
+}
+
+/**
+ * Implements hook_field_widget_info_alter().
+ */
+function field_ui_test_field_widget_info_alter(&$info) {
+  // Allow widget for the string field type.
+  if (isset($info['text_textfield'])) {
+    $info['text_textfield']['field_types'][] = 'string';
+  }
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_field_info_alter().
+ */
+function field_ui_test_entity_test_field_info_alter(&$info) {
+  // Allow to configure the name base field in field ui.
+  /** @var Drupal\Core\Field\FieldDefinitionInterface $definition */
+  $definition = $info['definitions']['name'];
+  $definition
+    ->setDisplayOptions('view', array(
+    'type' => 'text_default',
+    'weight' => 10,
+    ))
+    ->setDisplayConfigurable('view', TRUE)
+    ->setDisplayOptions('form', array(
+      'type' => 'text_textfield',
+      'weight' => 10,
+    ))
+    ->setDisplayConfigurable('form', TRUE);
+  $info['definitions']['name'] = $definition;
+}
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index c4faaf0..b36cf8b 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -54,7 +54,6 @@ function entity_test_entity_types($filter = NULL) {
     $types[] = 'entity_test_rev';
   }
   $types[] = 'entity_test_mulrev';
-  $types[] = 'entity_test_base_field_display';
   return drupal_map_assoc($types);
 }
 
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php
index 034ee70..89085bd 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestBaseFieldDisplay.php
@@ -48,7 +48,7 @@ public static function baseFieldDefinitions($entity_type) {
     $fields['test_no_display'] = FieldDefinition::create('text')
       ->setLabel(t('Field with no display'));
 
-    $fields['test_display_configurable'] = FieldDefinition::create('string')
+    $fields['test_display_configurable'] = FieldDefinition::create('text')
       ->setLabel(t('Field with configurable display'))
       ->setDisplayOptions('view', array(
         'type' => 'text_default',