diff --git a/core/lib/Drupal/Core/Entity/ContentEntityForm.php b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
index 7aa0669e51dbb5514ff551e58cfc817bfd94ffed..75bde9fe3502b48148d9e7d14dafabf72e888df2 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
@@ -56,6 +56,7 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
   public function __construct(EntityRepositoryInterface $entity_repository, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
     if ($entity_repository instanceof EntityManagerInterface) {
       @trigger_error('Passing the entity.manager service to ContentEntityForm::__construct() is deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Pass the entity.repository service instead. See https://www.drupal.org/node/2549139.', E_USER_DEPRECATED);
+      $this->entityManager = $entity_repository;
     }
     $this->entityRepository = $entity_repository;
     $this->entityTypeBundleInfo = $entity_type_bundle_info ?: \Drupal::service('entity_type.bundle.info');
diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityFormTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityFormTest.php
index d4f884575be314ada026ef809c296f6cde99bbd1..66a59788c26889e8228c776fdc2fce64c9a73398 100644
--- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityFormTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityFormTest.php
@@ -22,7 +22,12 @@ public function testEntityManagerDeprecation() {
     $entity_manager = $this->prophesize(EntityManagerInterface::class)->reveal();
     $entity_type_bundle_info = $this->prophesize(EntityTypeBundleInfoInterface::class)->reveal();
     $time = $this->prophesize(TimeInterface::class)->reveal();
-    new ContentEntityForm($entity_manager, $entity_type_bundle_info, $time);
+    $form = new ContentEntityForm($entity_manager, $entity_type_bundle_info, $time);
+
+    $reflected_form = new \ReflectionClass($form);
+    $entity_manager_property = $reflected_form->getProperty('entityManager');
+    $entity_manager_property->setAccessible(TRUE);
+    $this->assertTrue($entity_manager_property->getValue($form) === $entity_manager);
   }
 
 }