diff --git a/core/modules/search/tests/Drupal/search/Tests/SearchPageRepositoryTest.php b/core/modules/search/tests/Drupal/search/Tests/SearchPageRepositoryTest.php
index 32bf091..131f8fc 100644
--- a/core/modules/search/tests/Drupal/search/Tests/SearchPageRepositoryTest.php
+++ b/core/modules/search/tests/Drupal/search/Tests/SearchPageRepositoryTest.php
@@ -270,7 +270,7 @@ public function testSortSearchPages() {
       ->method('getClass')
       ->will($this->returnValue('Drupal\search\Tests\TestSearchPage'));
     $this->storage->expects($this->once())
-      ->method('entityType')
+      ->method('getEntityType')
       ->will($this->returnValue($entity_type));
 
     // Declare entities out of their expected order so we can be sure they were
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
index 93e8d71..24df3b7 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
@@ -462,14 +462,14 @@ public function testGetForm() {
 
     $apple_entity = $this->getMock('Drupal\Core\Entity\EntityInterface');
     $apple_entity->expects($this->once())
-      ->method('entityTypeId')
+      ->method('getEntityTypeId')
       ->will($this->returnValue('apple'));
 
     $this->assertSame('the form contents', $this->entityManager->getForm($apple_entity));
 
     $banana_entity = $this->getMock('Drupal\Core\Entity\EntityInterface');
     $banana_entity->expects($this->once())
-      ->method('entityTypeId')
+      ->method('getEntityTypeId')
       ->will($this->returnValue('banana'));
 
     $this->assertSame('the form contents', $this->entityManager->getForm($banana_entity));