diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index 40b9f71..34038e9 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -132,8 +132,7 @@ public function label($langcode = NULL);
    *
    * @return
    *   An array containing the 'path' and 'options' keys used to build the URI
-   *   of the entity, and matching the signature of url(). NULL if the entity
-   *   has no URI of its own.
+   *   of the entity, and matching the signature of url().
    */
   public function uri();
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php
index 0fbd670..66a00e5 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php
@@ -29,22 +29,19 @@ public static function getInfo() {
     );
   }
 
-  /**
-   * Overrides \Drupal\simpletest\DrupalUnitTestBase::setup().
-   */
-  function setUp() {
-      parent::setUp();
+  protected function setUp() {
+    parent::setUp();
 
-      $this->installSchema('system', 'variable');
-      $this->installSchema('system', 'url_alias');
-      $this->installSchema('field', 'field_config');
-      $this->installSchema('field', 'field_config_instance');
+    $this->installSchema('system', 'variable');
+    $this->installSchema('system', 'url_alias');
+    $this->installSchema('field', 'field_config');
+    $this->installSchema('field', 'field_config_instance');
 
-      $this->enableModules(array('entity_test'));
+    $this->enableModules(array('entity_test'));
   }
 
   /**
-   * Test that an entity without a URI callback uses the default URI.
+   * Tests that an entity without a URI callback uses the default URI.
    */
   function testDefaultUri() {
     // Create a test entity.