diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
index aedb321..dd6b409 100644
--- a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
+++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
@@ -274,7 +274,7 @@ public function testRenameDeleteBundle() {
     $type->old_type = 'article';
     $type->type = 'article_rename';
     $type->save();
-    \Drupal::entityManager()->getStorageController('entity_display')->resetCache();
+    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
     $old_display = entity_load('entity_view_display', 'node.article.default');
     $this->assertFalse($old_display);
     \Drupal::entityManager()->getStorageController('entity_form_display')->resetCache();
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
index 301fe49..dc685b5 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
@@ -69,7 +69,7 @@ function testFormatterUI() {
 
     // Submit the form and check that the display is updated.
     $this->drupalPostForm(NULL, array(), t('Save'));
-    \Drupal::entityManager()->getStorageController('entity_display')->resetCache();
+    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
     $display = entity_get_display('node', $this->type, 'default');
     $display_options = $display->getComponent('field_test');
     $current_format = $display_options['type'];
@@ -352,7 +352,7 @@ function assertNodeViewNoText(EntityInterface $node, $view_mode, $text, $message
   function assertNodeViewTextHelper(EntityInterface $node, $view_mode, $text, $message, $not_exists) {
     // Make sure caches on the tester side are refreshed after changes
     // submitted on the tested side.
-    \Drupal::entityManager()->getStorageController('entity_display')->resetCache();
+    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
     \Drupal::entityManager()->getStorageController('entity_form_display')->resetCache();
     field_info_cache_clear();
 
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
index aa523ef..1b5842c 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
@@ -232,7 +232,7 @@ public function testDefaultImages() {
     );
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('entity_display')->resetCache();
+    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
 
     // Reload the nodes.
     $article_built = node_view($article = node_load($article->id(),  TRUE));
@@ -270,7 +270,7 @@ public function testDefaultImages() {
     );
 
     // Reset cache.
-    \Drupal::entityManager()->getStorageController('entity_display')->resetCache();
+    \Drupal::entityManager()->getStorageController('entity_view_display')->resetCache();
 
     // Reload the nodes.
     $article_built = node_view($article = node_load($article->id(), TRUE));
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
index e1036a0..7b3388e 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
@@ -151,6 +151,7 @@ public function testPluginProviders() {
       // Save the plugin form, to change the plugin used.
       $this->drupalPostForm("admin/structure/views/nojs/display/test_view/default/$plugin_type", array($element_name => $plugin_options['value']), t('Apply'));
       $this->drupalPostForm('admin/structure/views/view/test_view', array(), t('Save'));
+      \Drupal::entityManager()->getStorageController('view')->resetCache(array('test_view'));
       // Check the plugin provider.
       $view = Views::getView('test_view');
       $displays = $view->storage->get('display');