diff -u b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
--- b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
@@ -62,7 +62,7 @@
   protected $typedDataManager;
 
   /**
-   * The typed data manager used for testing.
+   * The field type manager used for testing.
    *
    * @var \Drupal\Core\Field\FieldTypePluginManager|\PHPUnit_Framework_MockObject_MockObject
    */
@@ -167,14 +167,6 @@
         'id' => FieldDefinition::create('integer'),
         'revision_id' => FieldDefinition::create('integer'),
       )));
-    $this->entityManager->expects($this->any())
-      ->method('getFieldDefinition')
-      ->with($this->entityTypeId, $this->bundle)
-      ->will($this->returnValueMap(array(
-        'id' => FieldDefinition::create('integer'),
-        'revision_id' => FieldDefinition::create('integer'),
-      )));
-
     $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Entity\ContentEntityBase', array($values, $this->entityTypeId, $this->bundle));
   }