diff --git a/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module
index 6821c97..a435609 100644
--- a/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -275,3 +275,22 @@ function field_test_query_efq_table_prefixing_test_alter(&$query) {
   // exception if the EFQ does not properly prefix the base table.
   $query->join('test_entity','te2','%alias.ftid = test_entity.ftid');
 }
+
+/**
+ * Implements hook_field_formatter_settings_form_alter().
+ */
+function field_test_field_formatter_settings_form_alter(&$element, &$form_state, $context) {
+  $settings = $context['instance']['display'][$context['view_mode']]['settings'];
+  $element['field_test_formatter_settings_form_alter'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Formatter settings form alter'),
+    '#default_value' => isset($settings['field_test_formatter_settings_form_alter']) ? $settings['field_test_formatter_settings_form_alter'] : '',
+  );
+}
+
+/**
+ * Implements hook_field_formatter_settings_summary_alter().
+ */
+function field_test_field_formatter_settings_summary_alter(&$summary, $context) {
+  $summary .= '<br />field_test_field_formatter_settings_summary_alter';
+}
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
index 06ea02a..93514a6 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
@@ -22,7 +22,7 @@ class ManageDisplayTest extends FieldUiTestBase {
   }
 
   function setUp() {
-    parent::setUp(array('search'));
+    parent::setUp(array('search', 'field_test'));
   }
 
   /**
@@ -71,6 +71,22 @@ class ManageDisplayTest extends FieldUiTestBase {
     $current_setting_value = $instance['display']['default']['settings'][$setting_name];
     $this->assertEqual($current_format, $format, t('The formatter was updated.'));
     $this->assertEqual($current_setting_value, $setting_value, t('The setting was updated.'));
+
+    // Assert hook_field_formatter_settings_summary_alter is called.
+    $this->assertText('field_test_field_formatter_settings_summary_alter');
+
+    // Click on the formatter settings button to open the formatter settings form.
+    $this->drupalPostAJAX(NULL, array(), "field_test_formatter_settings_edit");
+
+    // Assert the field added in field_test_field_formatter_settings_form_alter is present.
+    $fieldname = 'fields[field_test][settings_edit_form][settings][field_test_formatter_settings_form_alter]';
+    $this->assertField($fieldname, t('Field added in hook_ield_formatter_settings_form_alter is present.'));
+    $edit = array($fieldname => 'foo');
+    $this->drupalPostAJAX(NULL, $edit, "field_test_formatter_settings_update");
+
+    // Open the formatter settings form again to check if the settings are updated.
+    $this->drupalPostAJAX(NULL, array(), "field_test_formatter_settings_edit");
+    $this->assertFieldByName($fieldname, 'foo');
   }
 
   /**