diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php
index a3226a9..a38762a 100644
--- a/core/modules/field/src/Tests/Number/NumberFieldTest.php
+++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php
@@ -145,7 +145,7 @@ function testNumberIntegerField() {
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
       'settings' => array(
-        'min' => $minimum, 'max' => $maximum,
+        'min' => $minimum, 'max' => $maximum, 'prefix' => 'ThePrefix',
       )
     ))->save();
 
@@ -160,6 +160,9 @@ function testNumberIntegerField() {
     entity_get_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
         'type' => 'number_integer',
+        'settings' => array(
+          'prefix_suffix' => FALSE,
+        ),
       ))
       ->save();
 
@@ -234,7 +237,29 @@ function testNumberIntegerField() {
       $id = $match[1];
       $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
       $this->assertRaw($valid_entry, 'Value is displayed.');
+      $this->assertNoFieldByXpath('//div[@content="' . $valid_entry . '"]', NULL, 'The "content" attribute is not present since the Prefix is not being displayed');
     }
+
+    // Test for the content attribute when a Prefix is displayed. Presumably this also tests for the attribute when a Suffix is displayed.
+    entity_get_display('entity_test', 'entity_test', 'default')
+      ->setComponent($field_name, array(
+        'type' => 'number_integer',
+        'settings' => array(
+          'prefix_suffix' => TRUE,
+        ),
+      ))
+      ->save();
+    $the_value = '123';
+    $this->drupalGet('entity_test/add');
+    $edit = array(
+      "{$field_name}[0][value]" => $the_value,
+    );
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    $id = $match[1];
+    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->drupalGet('entity_test/' . $id);
+    $this->assertFieldByXPath('//div[@content="' . $the_value . '"]', 'ThePrefix' . $the_value, 'The "content" attribute has been set to the value of the field, and the prefix is being displayed.');
   }
 
   /**