diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index f1db4d4..1475e33 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -271,6 +271,23 @@ function cardinalitySettings() {
     $this->assertLink(t('Field settings'));
     $this->assertLinkByHref($field_edit_path);
 
+    // Add two entries in the body.
+    $edit = array('title[0][value]' => 'Cardinality', 'body[0][value]' => 'Body 1', 'body[1][value]' => 'Body 2');
+    $this->drupalPostForm('node/add/article', $edit, 'Save');
+    $parts = explode('/', $this->getUrl());
+    $nid = array_pop($parts);
+
+    // Assert that you can't set the cardinality to a lower number then the
+    // highest delta of this field.
+    $edit = array(
+      'cardinality' => 'number',
+      'cardinality_number' => 1,
+    );
+    $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
+    $this->assertText('You can not change the cardinality lower then 2');
+    $this->drupalPostForm('node/' . $nid . '/edit', array(), 'Save');
+    $this->assertText('Body 2');
+
     // Set to unlimited.
     $edit = array(
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
@@ -280,6 +297,19 @@ function cardinalitySettings() {
     $this->drupalGet($field_edit_path);
     $this->assertFieldByXPath("//select[@name='cardinality']", FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
     $this->assertFieldByXPath("//input[@name='cardinality_number']", 1);
+
+    $edit = array('title[0][value]' => 'Cardinality', 'body[0][value]' => 'Body 1', 'body[1][value]' => 'Body 2');
+    $this->drupalPostForm('node/' . $nid . '/edit', $edit, 'Save');
+    // Assert that you can't set the cardinality to a lower number then the
+    // highest delta of this field.
+    $edit = array(
+      'cardinality' => 'number',
+      'cardinality_number' => 1,
+    );
+    $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
+    $this->assertText('You can not change the cardinality lower then 2');
+    $this->drupalPostForm('node/' . $nid . '/edit', array(), 'Save');
+    $this->assertText('Body 2');
   }
 
   /**