diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListTest.php b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListTest.php
index 47d5fb7..e7c33c0 100644
--- a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListTest.php
+++ b/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListTest.php
@@ -126,7 +126,7 @@ public function testBuildRowEntityList() {
 
     // Setup a view list with a mocked buildOperations method,
     // because t() is called on there.
-    $view_list_controller = $this->getMock('Drupal\views_ui\ViewListController', array('buildOperations'), array('view', $storage_controller, $entity_info, $display_manager, $module_handler));
+    $view_list_controller = $this->getMock('Drupal\views_ui\ViewList', array('buildOperations'), array('view', $storage_controller, $entity_info, $display_manager, $module_handler));
     $view_list_controller->expects($this->any())
       ->method('buildOperations')
       ->will($this->returnValue(array()));
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityListTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityListTest.php
index e661526..842663f 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityListTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityListTest.php
@@ -78,7 +78,7 @@ protected function setUp() {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $this->entityListController = $this->getMock('Drupal\entity_test\EntityTestListController', array('buildOperations'), array('user_role', static::$entityInfo, $role_storage_controller, $module_handler));
+    $this->entityListController = $this->getMock('Drupal\entity_test\EntityTestList', array('buildOperations'), array('user_role', static::$entityInfo, $role_storage_controller, $module_handler));
 
     $this->entityListController->expects($this->any())
       ->method('buildOperations')