diff --git a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageMappingConfigEntityUnitTest.php b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageMappingConfigEntityUnitTest.php
index 99c08b8..df8a0ab 100644
--- a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageMappingConfigEntityUnitTest.php
+++ b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageMappingConfigEntityUnitTest.php
@@ -80,7 +80,7 @@ public function testCalculateDependencies() {
 
   /**
    * @covers ::addMapping
-   * @covers ::hasMapping
+   * @covers ::hasMappings
    */
   public function testHasMappings() {
     $entity = new ResponsiveImageMapping(array());
diff --git a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
index 858b8d6..cbe28dd 100644
--- a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
+++ b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
@@ -81,7 +81,6 @@ protected function mockModuleExtension($module, $name) {
    *
    * @covers ::__construct
    * @covers ::getPermissions
-   * @covers ::buildPermissions
    * @covers ::buildPermissionsYaml
    * @covers ::moduleProvidesPermissions
    */
@@ -154,7 +153,6 @@ public function testBuildPermissionsYaml() {
    *
    * @covers ::__construct
    * @covers ::getPermissions
-   * @covers ::buildPermissions
    * @covers ::buildPermissionsYaml
    * @covers ::sortPermissions
    */
@@ -204,7 +202,6 @@ public function testBuildPermissionsSortPerModule() {
    *
    * @covers ::__construct
    * @covers ::getPermissions
-   * @covers ::buildPermissions
    * @covers ::buildPermissionsYaml
    */
   public function testBuildPermissionsYamlCallback() {
diff --git a/core/tests/Drupal/Tests/Core/DrupalTest.php b/core/tests/Drupal/Tests/Core/DrupalTest.php
index f56dee2..21ea3dd 100644
--- a/core/tests/Drupal/Tests/Core/DrupalTest.php
+++ b/core/tests/Drupal/Tests/Core/DrupalTest.php
@@ -14,6 +14,7 @@
 /**
  * Tests the Drupal class.
  *
+ * @coversDefaultClass Drupal
  * @group DrupalTest
  */
 class DrupalTest extends UnitTestCase {
@@ -33,6 +34,8 @@ protected function setUp() {
 
   /**
    * Tests the get/setContainer() method.
+   *
+   * @covers ::getContainer
    */
   public function testSetContainer() {
     \Drupal::setContainer($this->container);
@@ -41,6 +44,8 @@ public function testSetContainer() {
 
   /**
    * Tests the service() method.
+   *
+   * @covers ::service
    */
   public function testService() {
     $this->setMockContainerService('test_service');
@@ -49,6 +54,8 @@ public function testService() {
 
   /**
    * Tests the currentUser() method.
+   *
+   * @covers ::currentUser
    */
   public function testCurrentUser() {
     $this->setMockContainerService('current_user');
@@ -57,6 +64,8 @@ public function testCurrentUser() {
 
   /**
    * Tests the entityManager() method.
+   *
+   * @covers ::entityManager
    */
   public function testEntityManager() {
     $this->setMockContainerService('entity.manager');
@@ -65,6 +74,8 @@ public function testEntityManager() {
 
   /**
    * Tests the database() method.
+   *
+   * @covers ::database
    */
   public function testDatabase() {
     $this->setMockContainerService('database');
@@ -73,6 +84,8 @@ public function testDatabase() {
 
   /**
    * Tests the service() method.
+   *
+   * @covers ::cache
    */
   public function testCache() {
     $this->setMockContainerService('cache.test');
@@ -81,6 +94,8 @@ public function testCache() {
 
   /**
    * Tests the keyValueExpirable() method.
+   *
+   * @covers ::keyValueExpirable
    */
   public function testKeyValueExpirable() {
     $keyvalue = $this->getMockBuilder('Drupal\Core\KeyValueStore\KeyValueExpirableFactory')
@@ -97,6 +112,8 @@ public function testKeyValueExpirable() {
 
   /**
    * Tests the lock() method.
+   *
+   * @covers ::lock
    */
   public function testLock() {
     $this->setMockContainerService('lock');
@@ -105,6 +122,8 @@ public function testLock() {
 
   /**
    * Tests the config() method.
+   *
+   * @covers ::config
    */
   public function testConfig() {
     $config = $this->getMock('Drupal\Core\Config\ConfigFactoryInterface');
@@ -119,6 +138,8 @@ public function testConfig() {
 
   /**
    * Tests the queue() method.
+   *
+   * @covers ::queue
    */
   public function testQueue() {
     $queue = $this->getMockBuilder('Drupal\Core\Queue\QueueFactory')
@@ -147,6 +168,8 @@ public function testRequestStack() {
 
   /**
    * Tests the keyValue() method.
+   *
+   * @covers ::keyValue
    */
   public function testKeyValue() {
     $keyvalue = $this->getMockBuilder('Drupal\Core\KeyValueStore\KeyValueFactory')
@@ -163,6 +186,8 @@ public function testKeyValue() {
 
   /**
    * Tests the state() method.
+   *
+   * @covers ::state
    */
   public function testState() {
     $this->setMockContainerService('state');
@@ -171,6 +196,8 @@ public function testState() {
 
   /**
    * Tests the httpClient() method.
+   *
+   * @covers ::httpClient
    */
   public function testHttpClient() {
     $this->setMockContainerService('http_client');
@@ -179,6 +206,8 @@ public function testHttpClient() {
 
   /**
    * Tests the entityQuery() method.
+   *
+   * @covers ::entityQuery
    */
   public function testEntityQuery() {
     $query = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory')
@@ -195,6 +224,8 @@ public function testEntityQuery() {
 
   /**
    * Tests the entityQueryAggregate() method.
+   *
+   * @covers ::entityQueryAggregate
    */
   public function testEntityQueryAggregate() {
     $query = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory')
@@ -211,6 +242,8 @@ public function testEntityQueryAggregate() {
 
   /**
    * Tests the flood() method.
+   *
+   * @covers ::flood
    */
   public function testFlood() {
     $this->setMockContainerService('flood');
@@ -219,6 +252,8 @@ public function testFlood() {
 
   /**
    * Tests the moduleHandler() method.
+   *
+   * @covers ::moduleHandler
    */
   public function testModuleHandler() {
     $this->setMockContainerService('module_handler');
@@ -227,6 +262,8 @@ public function testModuleHandler() {
 
   /**
    * Tests the typedData() method.
+   *
+   * @covers ::typedDataManager
    */
   public function testTypedDataManager() {
     $this->setMockContainerService('typed_data_manager');
@@ -235,6 +272,8 @@ public function testTypedDataManager() {
 
   /**
    * Tests the token() method.
+   *
+   * @covers ::token
    */
   public function testToken() {
     $this->setMockContainerService('token');
@@ -243,6 +282,8 @@ public function testToken() {
 
   /**
    * Tests the urlGenerator() method.
+   *
+   * @covers ::urlGenerator
    */
   public function testUrlGenerator() {
     $this->setMockContainerService('url_generator');
@@ -250,8 +291,9 @@ public function testUrlGenerator() {
   }
 
   /**
-   * Tests the _url() method.
+   * Tests the url() method.
    *
+   * @covers ::url
    * @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute()
    */
   public function testUrl() {
@@ -269,6 +311,8 @@ public function testUrl() {
 
   /**
    * Tests the linkGenerator() method.
+   *
+   * @covers ::linkGenerator
    */
   public function testLinkGenerator() {
     $this->setMockContainerService('link_generator');
@@ -276,8 +320,9 @@ public function testLinkGenerator() {
   }
 
   /**
-   * Tests the _l() method.
+   * Tests the l() method.
    *
+   * @covers ::l
    * @see \Drupal\Core\Utility\LinkGeneratorInterface::generate()
    */
   public function testL() {
@@ -296,6 +341,8 @@ public function testL() {
 
   /**
    * Tests the translation() method.
+   *
+   * @covers ::translation
    */
   public function testTranslation() {
     $this->setMockContainerService('string_translation');
@@ -304,6 +351,8 @@ public function testTranslation() {
 
   /**
    * Tests the languageManager() method.
+   *
+   * @covers ::languageManager
    */
   public function testLanguageManager() {
     $this->setMockContainerService('language_manager');
@@ -312,6 +361,8 @@ public function testLanguageManager() {
 
   /**
    * Tests the csrfToken() method.
+   *
+   * @covers ::csrfToken
    */
   public function testCsrfToken() {
     $this->setMockContainerService('csrf_token');
@@ -320,6 +371,8 @@ public function testCsrfToken() {
 
   /**
    * Tests the transliteration() method.
+   *
+   * @covers ::transliteration
    */
   public function testTransliteration() {
     $this->setMockContainerService('transliteration');
@@ -328,6 +381,8 @@ public function testTransliteration() {
 
   /**
    * Tests the formBuilder() method.
+   *
+   * @covers ::formBuilder
    */
   public function testFormBuilder() {
     $this->setMockContainerService('form_builder');
@@ -336,6 +391,8 @@ public function testFormBuilder() {
 
   /**
    * Tests the menuTree() method.
+   *
+   * @covers ::menuTree
    */
   public function testMenuTree() {
     $this->setMockContainerService('menu.link_tree');
@@ -344,6 +401,8 @@ public function testMenuTree() {
 
   /**
    * Tests the pathValidator() method.
+   *
+   * @covers ::pathValidator
    */
   public function testPathValidator() {
     $this->setMockContainerService('path.validator');
@@ -352,6 +411,8 @@ public function testPathValidator() {
 
   /**
    * Tests the accessManager() method.
+   *
+   * @covers ::accessManager
    */
   public function testAccessManager() {
     $this->setMockContainerService('access_manager');
diff --git a/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php b/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
index 1f0efbd..0122f49 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
@@ -28,8 +28,6 @@ class ContextHandlerTest extends UnitTestCase {
 
   /**
    * {@inheritdoc}
-   *
-   * @covers ::__construct
    */
   protected function setUp() {
     parent::setUp();
diff --git a/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php b/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
index 84b1661..3e8676f 100644
--- a/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Routing\Route;
 
 /**
- * @coversDefaultClass \Drupal\Core\Routing\Router
+ * @coversDefaultClass \Drupal\Core\Routing\AccessAwareRouter
  * @group Routing
  */
 class AccessAwareRouterTest extends UnitTestCase {