diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index 6cd0eac..43cc072 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -561,16 +561,4 @@ public function getTypeId() {
     return $this->bundle();
   }
 
-  /**
-   * Default value callback for 'uid' base field definition.
-   *
-   * @see ::baseFieldDefinitions()
-   *
-   * @return array
-   *   An array of default values.
-   */
-  public static function getCurrentUserId() {
-    return array(\Drupal::currentUser()->id());
-  }
-
 }
diff --git a/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php b/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php
index 87809ef..a536439 100644
--- a/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php
+++ b/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php
@@ -37,6 +37,7 @@ protected function setUp() {
     parent::setUp();
     $this->installConfig(array('system'));
     $this->installEntitySchema('file');
+    $this->installEntitySchema('user');
     $this->installSchema('file', array('file_usage'));
 
     $manager = $this->container->get('plugin.manager.filter');
diff --git a/core/modules/node/src/Tests/NodeFieldOverridesTest.php b/core/modules/node/src/Tests/NodeFieldOverridesTest.php
index 2472abe..e51675a 100644
--- a/core/modules/node/src/Tests/NodeFieldOverridesTest.php
+++ b/core/modules/node/src/Tests/NodeFieldOverridesTest.php
@@ -57,7 +57,7 @@ public function testFieldOverrides() {
     $uid_field = \Drupal::entityManager()->getBaseFieldDefinitions('node')['uid'];
     $config = $uid_field->getConfig('ponies');
     $config->save();
-    $this->assertEqual($config->get('default_value_callback'), 'Drupal\node\Entity\Node::getCurrentUserId');
+    $this->assertEqual($config->get('default_value_callback'), 'Drupal\Core\Entity\ContentEntityBase::getCurrentUserId');
     /** @var \Drupal\node\NodeInterface $node */
     $node = Node::create(['type' => 'ponies']);
     $owner = $node->getOwner();
diff --git a/core/modules/system/src/Tests/TypedData/TypedDataTest.php b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
index 61b8cd7..582348a 100644
--- a/core/modules/system/src/Tests/TypedData/TypedDataTest.php
+++ b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
@@ -39,6 +39,7 @@ protected function setUp() {
     parent::setup();
 
     $this->installEntitySchema('file');
+    $this->installEntitySchema('user');
     $this->typedDataManager = $this->container->get('typed_data_manager');
   }