diff --git a/core/modules/field/lib/Drupal/field/Tests/FormTest.php b/core/modules/field/lib/Drupal/field/Tests/FormTest.php
index 8c2af9b..64e9313 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FormTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FormTest.php
@@ -58,7 +58,13 @@ class FormTest extends FieldTestBase {
     $this->assertFieldByName("{$this->field_name}[$langcode][0][value]", '', 'Widget is displayed');
     $this->assertNoField("{$this->field_name}[$langcode][1][value]", 'No extraneous widget is displayed');
     // TODO : check that the widget is populated with default value ?
-
+    
+    // Check that neither hook_field_widget_properties_alter nor
+    // hook_widget_form_alter believe this is the default
+    // value form.
+    $this->assertNoText('From hook_field_widget_properties_alter: Default form is true.', t('Not default value form in hook_field_widget_properties_alter.'));
+    $this->assertNoText('From hook_field_widget_form_alter: Default form is true.', t('Not default value form in hook_field_widget_form_alter.'));
+    
     // Submit with invalid value (field-level validation).
     $edit = array("{$this->field_name}[$langcode][0][value]" => -1);
     $this->drupalPost(NULL, $edit, t('Save'));
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 9b4a3aa..baf1683 100644
--- a/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -238,6 +238,10 @@ function field_test_field_widget_properties_alter(&$widget, $context) {
   if (in_array($context['entity_type'], array('node', 'comment')) && ($context['field']['field_name'] == 'alter_test_text')) {
     $widget['settings']['size'] = 42;
   }
+  // Set a message if this is for the form displayed to set default value for the field instance.
+  if ($context['default']) {
+    drupal_set_message('From hook_field_widget_properties_alter: Default form is true.');
+  }
 }
 
 /**
@@ -263,4 +267,8 @@ function field_test_field_widget_form_alter(&$element, &$form_state, $context) {
       drupal_set_message('Widget type: ' . $context['instance']['widget']['type']);
       break;
   }
+  // Set a message if this is for the form displayed to set default value for the field instance.
+  if ($context['default']) {
+    drupal_set_message('From hook_field_widget_alter: Default form is true.');
+  }
 }
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/AlterTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/AlterTest.php
index 1f67939..4763d08 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/AlterTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/AlterTest.php
@@ -61,7 +61,12 @@ class AlterTest extends WebTestBase {
     // size when the form is displayed.
     $this->drupalGet('admin/structure/types/manage/article/fields/alter_test_text');
     $this->assertText('Field size: 42', 'Altered field size is found in hook_field_widget_form_alter().');
-
+    // Test that hook_field_widget_properties_alter and
+    // hook_field_widget_form_alter registers this is the default value
+    // form and sets a message.
+    $this->assertText('From hook_field_widget_properties_alter: Default form is true.', t('Default value form detected in hook_field_widget_properties_alter.'));
+    $this->assertText('From hook_field_widget_form_alter: Default form is true.', t('Default value form detected in hook_field_widget_form_alter.'));
+    
     // Create the alter_test_options field.
     field_create_field(array(
       'field_name' => 'alter_test_options',