diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 2c94b6c..b6ce5f0 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1576,9 +1576,7 @@ function template_preprocess_field_multiple_value_form(&$variables) {
       array(
         'data' => array(
           '#prefix' => '<h4' . $header_attributes . '>',
-          'title' => array(
-            '#markup' => $element['#title'],
-          ),
+          '#markup' => $element['#title'],
           '#suffix' => '</h4>',
         ),
         'colspan' => 2,
diff --git a/core/modules/field_ui/src/Tests/EntityFormDisplayWebTest.php b/core/modules/field_ui/src/Tests/EntityFormDisplayWebTest.php
deleted file mode 100644
index 48922d7..0000000
--- a/core/modules/field_ui/src/Tests/EntityFormDisplayWebTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field_ui\Tests\EntityFormDisplayWebTest.
- */
-
-namespace Drupal\field_ui\Tests;
-
-use Drupal\entity_test\Entity\EntityTestBaseFieldDisplay;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests the entity display configuration entities.
- *
- * @group field_ui
- */
-class EntityFormDisplayWebTest extends WebTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var string[]
-   */
-  public static $modules = ['field_ui', 'field', 'entity_test', 'field_test', 'user', 'text'];
-
-  /**
-   * Tests the behavior of a field widget for a base field.
-   */
-  public function testBaseFieldComponent() {
-    $user = $this->drupalCreateUser(['administer entity_test content']);
-    $this->drupalLogin($user);
-
-    $entity = EntityTestBaseFieldDisplay::create(['name' => $this->randomString()]);
-    $entity->save();
-
-    $this->drupalGet('entity_test_base_field_display/manage/' . $entity->id());
-    $this->assertRaw($entity->label());
-    $this->assertText('A field with multiple values');
-    $this->drupalPostForm(NULL, [], t('Add another item'));
-
-    $edit['test_display_multiple[0][value]'] = $this->randomString();
-    $edit['test_display_multiple[1][value]'] = $this->randomString();
-    $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText('entity_test_base_field_display ' . $entity->id() . ' has been updated.');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityBaseFieldTest.php b/core/modules/system/src/Tests/Entity/EntityBaseFieldTest.php
new file mode 100644
index 0000000..a13038f
--- /dev/null
+++ b/core/modules/system/src/Tests/Entity/EntityBaseFieldTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Entity\EntityFormDisplayWebTest.
+ */
+
+namespace Drupal\system\Tests\Entity;
+
+use Drupal\entity_test\Entity\EntityTestBaseFieldDisplay;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the entity base fields.
+ *
+ * @group Entity
+ */
+class EntityBaseFieldTest extends WebTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var string[]
+   */
+  public static $modules = ['entity_test'];
+
+  /**
+   * Tests the display of the label for multi-value base fields.
+   */
+  public function testLabelOnMultiValueBaseFields() {
+    $user = $this->drupalCreateUser(['administer entity_test content']);
+    $this->drupalLogin($user);
+
+    $entity = EntityTestBaseFieldDisplay::create(['name' => $this->randomString()]);
+    $entity->save();
+
+    $this->drupalGet('entity_test_base_field_display/manage/' . $entity->id());
+    $this->assertResponse(200);
+    $this->assertRaw($entity->label());
+    $this->assertText('A field with multiple values');
+    // Test if labels were XSS filtered.
+    $this->assertEscaped("<script>alert('another multi-value');</script>");
+  }
+
+}
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
index 915f057..2a5ca41 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
@@ -84,6 +84,19 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
         'weight' => 12,
       ));
 
+    // A multi-value base field with a dangerous label.
+    $fields['test_display_another_multiple'] = BaseFieldDefinition::create('text')
+      ->setLabel("<script>alert('another multi-value');</script>")
+      ->setCardinality(FieldStorageDefinition::CARDINALITY_UNLIMITED)
+      ->setDisplayOptions('view', array(
+        'type' => 'text_default',
+        'weight' => 12,
+      ))
+      ->setDisplayOptions('form', array(
+        'type' => 'text_textfield',
+        'weight' => 12,
+      ));
+
     return $fields;
   }