diff --git a/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php b/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
index ba96bc9..56005be 100644
--- a/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
+++ b/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
@@ -247,16 +247,24 @@ function testEntityFormDisplayBuildForm() {
     $this->createFieldWithStorage('_2');
 
     $entity_type = 'entity_test';
-    $entity = entity_create($entity_type, array('id' => 1, 'revision_id' => 1, 'type' => $this->fieldTestData->field->getTargetBundle()));
+    $bundle = $this->fieldTestData->field->getTargetBundle();
+    $entity = entity_create($entity_type, array('id' => 1, 'revision_id' => 1, 'type' => $bundle));
 
     // Test generating widgets for all fields.
-    $display = entity_get_form_display($entity_type, $this->fieldTestData->field->getTargetBundle(), 'default');
+    $display = entity_get_form_display($entity_type, $bundle, 'default');
     $form = array();
     $form_state = new FormState();
     $display->buildForm($entity, $form, $form_state);
 
     $this->assertEqual($form[$this->fieldTestData->field_name]['widget']['#title'], $this->fieldTestData->field->getLabel(), "First field's form title is {$this->fieldTestData->field->getLabel()}");
     $this->assertEqual($form[$this->fieldTestData->field_name_2]['widget']['#title'], $this->fieldTestData->field_2->getLabel(), "Second field's form title is {$this->fieldTestData->field_2->getLabel()}");
+
+    $this->assertEquals($entity_type, $form[$this->fieldTestData->field_name]['widget']['#entity_type'], "First field's entity type is {$entity_type}");
+    $this->assertEquals($entity_type, $form[$this->fieldTestData->field_name_2]['widget']['#entity_type'], "Second field's entity type is {$entity_type}");
+
+    $this->assertEquals($bundle, $form[$this->fieldTestData->field_name]['widget']['#bundle'], "First field's entity bundle is {$bundle}");
+    $this->assertEquals($bundle, $form[$this->fieldTestData->field_name_2]['widget']['#bundle'], "Second field's entity bundle is {$bundle}");
+
     for ($delta = 0; $delta < $this->fieldTestData->field_storage->getCardinality(); $delta++) {
       // field_test_widget uses 'textfield'
       $this->assertEqual($form[$this->fieldTestData->field_name]['widget'][$delta]['value']['#type'], 'textfield', "First field's form delta $delta widget is textfield");