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 c02a40c..ab1a960 100644
--- a/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -203,11 +203,14 @@ function field_test_field_widget_settings_summary_alter(&$summary, $context) {
  * Implements hook_field_formatter_settings_form_alter().
  */
 function field_test_field_formatter_settings_form_alter(&$element, &$form_state, $context) {
-  $element['field_test_formatter_settings_form_alter'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Formatter settings form alter'),
-    '#default_value' => $context['formatter']->getSetting('field_test_formatter_settings_form_alter'),
-  );
+  $formatter = $context['formatter'];
+  if ($formatter->getPluginId() != 'field_empty_test') {
+    $element['field_test_formatter_settings_form_alter'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Formatter settings form alter'),
+      '#default_value' => $context['formatter']->getSetting('field_test_formatter_settings_form_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 ca31aae..8d22548 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
@@ -98,12 +98,18 @@ function testFormatterUI() {
     $edit = array('fields[field_test][type]' => 'field_empty_setting');
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertNoText('Default empty setting now has a value.');
+    $this->assertFieldById('edit-fields-body-settings-edit');
     $this->assertFieldById('edit-fields-field-test-settings-edit');
     $this->drupalPostAjaxForm(NULL, array(), "field_test_settings_edit");
     $fieldname = 'fields[field_test][settings_edit_form][settings][field_empty_setting]';
     $edit = array($fieldname => 'non empty setting');
     $this->drupalPostAjaxForm(NULL, $edit, "field_test_plugin_settings_update");
     $this->assertText('Default empty setting now has a value.');
+
+    // Test the empty settings form behavior.
+    $edit = array('fields[field_test][type]' => 'field_empty_test', 'refresh_rows' => 'field_test');
+    $this->drupalPostAjaxForm(NULL, $edit, array('op' => t('Refresh')));
+    $this->assertNoFieldByName('field_test_settings_edit');
   }
 
   /**