diff -u b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php --- b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php @@ -341,9 +341,7 @@ ->setMethods(array('schemaHandler')) ->getMock(); - $schema_handler = $this->getMockBuilder('Drupal\Core\Entity\Schema\ContentEntitySchemaHandler') - ->setConstructorArgs(array($this->entityManager, $this->entityType, $storage, $this->connection)) - ->getMock(); + $schema_handler = new ContentEntitySchemaHandler($this->entityManager, $this->entityType, $storage, $this->connection); $storage ->expects($this->any()) diff -u b/core/tests/Drupal/Tests/Core/Entity/Schema/ContentEntitySchemaHandlerTest.php b/core/tests/Drupal/Tests/Core/Entity/Schema/ContentEntitySchemaHandlerTest.php --- b/core/tests/Drupal/Tests/Core/Entity/Schema/ContentEntitySchemaHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Schema/ContentEntitySchemaHandlerTest.php @@ -811,6 +811,8 @@ $connection->expects($this->any()) ->method('schema') ->will($this->returnValue($db_schema_handler)); + + $this->schemaHandler = new ContentEntitySchemaHandler($this->entityManager, $this->entityType, $this->storage, $connection); } /**