diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Form/EntityNestedForm.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Form/EntityNestedForm.php
index 5834d37..942633e 100644
--- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Form/EntityNestedForm.php
+++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Form/EntityNestedForm.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Entity\EntityManager;
 use Drupal\entity_test\Plugin\Core\Entity\EntityTest;
 
 /**
@@ -19,16 +20,24 @@
 class EntityNestedForm implements FormInterface, ControllerInterface {
 
   /**
+   * Entity Manager Service.
+   *
+   * @var Drupal\Core\Entity\EntityManager
+   */
+  protected $entityManager;
+
+  /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static();
+    return new static($container->get('plugin.manager.entity'));
   }
 
   /**
    * Constructs an EntityNestedForm object.
    */
-  public function __construct() {
+  public function __construct(EntityManager $entityManager) {
+    $this->entityManager = $entityManager;
   }
 
   /**
@@ -54,7 +63,7 @@ public function buildForm(array $form, array &$form_state, EntityTest $entity_1
         '#value' => $entity_1->$key->value,
       );
     }
-    $form_state['form_display'] = entity_get_form_display($entity_1->entityType(), $entity_1->bundle(), 'default');
+    $form_state['form_display'] = $this->entityManager->getFormController($entity_1->entityType(), 'default')->getFormDisplay($form_state);
     field_attach_form($entity_1, $form, $form_state);
 
     // Second entity.
@@ -71,7 +80,7 @@ public function buildForm(array $form, array &$form_state, EntityTest $entity_1
         '#value' => $entity_2->$key->value,
       );
     }
-    $form_state['form_display'] = entity_get_form_display($entity_1->entityType(), $entity_1->bundle(), 'default');
+    $form_state['form_display'] = $this->entityManager->getFormController($entity_1->entityType(), 'default')->getFormDisplay($form_state);
     field_attach_form($entity_2, $form['entity_2'], $form_state);
 
     $form['save'] = array(
@@ -87,11 +96,11 @@ public function buildForm(array $form, array &$form_state, EntityTest $entity_1
    * {@inheritdoc}
    */
   public function validateForm(array &$form, array &$form_state) {
-    $entity_1 = entity_create('entity_test', $form_state['values']);
+    $entity_1 = $this->entityManager->getStorageController('entity_test')->create($form_state['values']);
     field_attach_extract_form_values($entity_1, $form, $form_state);
     field_attach_form_validate($entity_1, $form, $form_state);
 
-    $entity_2 = entity_create('entity_test', $form_state['values']['entity_2']);
+    $entity_2 = $this->entityManager->getStorageController('entity_test')->create($form_state['values']['entity_2']);
     field_attach_extract_form_values($entity_2, $form['entity_2'], $form_state);
     field_attach_form_validate($entity_2, $form['entity_2'], $form_state);
   }
@@ -100,11 +109,11 @@ public function validateForm(array &$form, array &$form_state) {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, array &$form_state) {
-    $entity_1 = entity_create('entity_test', $form_state['values']);
+    $entity_1 = $this->entityManager->getStorageController('entity_test')->create($form_state['values']);
     field_attach_extract_form_values($entity_1, $form, $form_state);
     $entity_1->save();
 
-    $entity_2 = entity_create('entity_test', $form_state['values']['entity_2']);
+    $entity_2 = $this->entityManager->getStorageController('entity_test')->create($form_state['values']['entity_2']);
     field_attach_extract_form_values($entity_2, $form['entity_2'], $form_state);
     $entity_2->save();