diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php
index 27a8000..30f6218 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php
@@ -77,7 +77,7 @@ public function setUp() {
     $this->node = $this->drupalCreateNode($node_data);
 
     // Force a flush of the in-memory storage.
-    \Drupal::service('views.views_data')->delete('comment');
+    \Drupal::service('views.views_data')->clear();
 
     // Create some comments and attach them to the created node.
     for ($i = 0; $i < $this->masterDisplayResults; $i++) {
diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php b/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
index b3a06cd..eda1736 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
@@ -47,7 +47,7 @@ public function testGetEntity() {
     $account->save();
     comment_add_default_comment_field('node', 'page');
     // Force a flush of the in-memory storage.
-    \Drupal::service('views.views_data')->delete('comment');
+    \Drupal::service('views.views_data')->clear();
 
     $node = entity_create('node', array('uid' => $account->id(), 'type' => 'page'));
     $node->save();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
index 5423559..e12207b 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
@@ -56,8 +56,7 @@ public static function getInfo() {
   public function testHandlers() {
     comment_add_default_comment_field('node', 'page');
     // Force a flush of the in-memory storage.
-    \Drupal::service('views.views_data')->delete('comment');
-    \Drupal::service('views.views_data')->delete('comment_entity_statistics');
+    \Drupal::service('views.views_data')->clear();
 
     $object_types = array_keys(ViewExecutable::viewsHandlerTypes());
     foreach (Views::viewsData()->get() as $base_table => $info) {