diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index bd9e3af..c305acf 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -398,7 +398,7 @@ function testDatelistWidget() {
         ),
       ))
       ->save();
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
+    \Drupal::entityTypeManager()->clearCachedFieldDefinitions();
 
     // Display creation form.
     $this->drupalGet('entity_test/add');
@@ -431,7 +431,7 @@ function testDatelistWidget() {
         ),
       ))
       ->save();
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
+    \Drupal::entityTypeManager()->clearCachedFieldDefinitions();
 
     // Go to the form display page to assert that increment option does appear on Date Time
     $fieldEditUrl = 'entity_test/structure/entity_test/form-display';
@@ -491,7 +491,7 @@ function testDatelistWidget() {
         ),
       ))
       ->save();
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
+    \Drupal::entityTypeManager()->clearCachedFieldDefinitions();
 
     // Display creation form.
     $this->drupalGet('entity_test/add');
@@ -531,7 +531,7 @@ function testDatelistWidget() {
         ),
       ))
       ->save();
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
+    \Drupal::entityTypeManager()->clearCachedFieldDefinitions();
 
     // Test the widget for validation notifications.
     foreach ($this->datelistDataProvider() as $data) {
@@ -654,7 +654,7 @@ function testDefaultValue() {
     $this->assertEqual($config_entity['default_value'][0], array('default_date_type' => 'now', 'default_date' => 'now'), 'Default value has been stored successfully');
 
     // Clear field cache in order to avoid stale cache values.
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
+    \Drupal::entityTypeManager()->clearCachedFieldDefinitions();
 
     // Create a new node to check that datetime field default value is today.
     $new_node = Node::create(['type' => 'date_content']);
@@ -687,7 +687,7 @@ function testDefaultValue() {
     $this->assertEqual($config_entity['default_value'][0], array('default_date_type' => 'relative', 'default_date' => '+90 days'), 'Default value has been stored successfully');
 
     // Clear field cache in order to avoid stale cache values.
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
+    \Drupal::entityTypeManager()->clearCachedFieldDefinitions();
 
     // Create a new node to check that datetime field default value is +90 days.
     $new_node = Node::create(['type' => 'date_content']);
@@ -710,7 +710,7 @@ function testDefaultValue() {
     $this->assertTrue(empty($config_entity['default_value']), 'Empty default value has been stored successfully');
 
     // Clear field cache in order to avoid stale cache values.
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
+    \Drupal::entityTypeManager()->clearCachedFieldDefinitions();
 
     // Create a new node to check that datetime field default value is not set.
     $new_node = Node::create(['type' => 'date_content']);
@@ -856,7 +856,7 @@ public function testDateStorageSettings() {
    */
   protected function renderTestEntity($id, $view_mode = 'full', $reset = TRUE) {
     if ($reset) {
-      \Drupal::entityManager()->getStorage('entity_test')->resetCache(array($id));
+      \Drupal::entityTypeManager()->getStorage('entity_test')->resetCache(array($id));
     }
     $entity = entity_load('entity_test', $id);
     $display = EntityViewDisplay::collectRenderDisplay($entity, $view_mode);