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/Cache/CacheTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheTest.php
index e5ae63c..a3d34d3 100644
--- a/core/tests/Drupal/Tests/Core/Cache/CacheTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/CacheTest.php
@@ -45,7 +45,7 @@ public function validateTagsProvider() {
   }
 
   /**
-   * @covers validateTags
+   * @covers ::validateTags
    *
    * @dataProvider validateTagsProvider
    */
@@ -74,7 +74,7 @@ public function mergeTagsProvider() {
   }
 
   /**
-   * @covers mergeTags
+   * @covers ::mergeTags
    *
    * @dataProvider mergeTagsProvider
    */
@@ -108,7 +108,7 @@ public function buildTagsProvider() {
   }
 
   /**
-   * @covers buildTags
+   * @covers ::buildTags
    *
    * @dataProvider buildTagsProvider
    */
@@ -117,7 +117,7 @@ public function testBuildTags($prefix, array $suffixes, array $expected) {
   }
 
   /**
-   * @covers deleteTags
+   * @covers ::deleteTags
    *
    * @expectedException \LogicException
    * @expectedExceptionMessage Cache tags must be strings, array given.
@@ -127,7 +127,7 @@ public function testDeleteTags() {
   }
 
   /**
-   * @covers invalidateTags
+   * @covers ::invalidateTags
    *
    * @expectedException \LogicException
    * @expectedExceptionMessage Cache tags must be strings, array given.
diff --git a/core/tests/Drupal/Tests/Core/DrupalTest.php b/core/tests/Drupal/Tests/Core/DrupalTest.php
index f56dee2..b281eef 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 {
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index 788744f..222dd13 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
@@ -81,12 +81,10 @@ protected function setUp() {
    * Tests the schema for non-revisionable, non-translatable entities.
    *
    * @covers ::__construct()
-   * @covers ::getSchema()
    * @covers ::getEntitySchemaTables()
    * @covers ::initializeBaseTable()
    * @covers ::addTableDefaults()
    * @covers ::getEntityIndexName()
-   * @covers ::addFieldSchema()
    * @covers ::getFieldIndexes()
    * @covers ::getFieldUniqueKeys()
    * @covers ::getFieldForeignKeys()
@@ -389,7 +387,6 @@ public function testGetSchemaBase() {
    * Tests the schema for revisionable, non-translatable entities.
    *
    * @covers ::__construct()
-   * @covers ::getSchema()
    * @covers ::getEntitySchemaTables()
    * @covers ::initializeBaseTable()
    * @covers ::initializeRevisionTable()
@@ -489,7 +486,6 @@ public function testGetSchemaRevisionable() {
    * Tests the schema for non-revisionable, translatable entities.
    *
    * @covers ::__construct()
-   * @covers ::getSchema()
    * @covers ::getEntitySchemaTables()
    * @covers ::initializeDataTable()
    * @covers ::addTableDefaults()
@@ -579,7 +575,6 @@ public function testGetSchemaTranslatable() {
    * Tests the schema for revisionable, translatable entities.
    *
    * @covers ::__construct()
-   * @covers ::getSchema()
    * @covers ::getEntitySchemaTables()
    * @covers ::initializeDataTable()
    * @covers ::addTableDefaults()
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/Plugin/DefaultPluginManagerTest.php b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
index 9d7f08f..a4750ca 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
@@ -213,7 +213,6 @@ public function testCacheClearWithTags() {
    * Tests plugins with the proper interface.
    *
    * @covers ::createInstance
-   * @covers ::enforcePluginInterface
    */
   public function testCreateInstanceWithJustValidInterfaces() {
     $plugin_manager = new TestPluginManager($this->namespaces, $this->expectedDefinitions, NULL, NULL, '\Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface');
@@ -227,7 +226,6 @@ public function testCreateInstanceWithJustValidInterfaces() {
    * Tests plugins without the proper interface.
    *
    * @covers ::createInstance
-   * @covers ::enforcePluginInterface
    *
    * @expectedException \Drupal\Component\Plugin\Exception\PluginException
    * @expectedExceptionMessage Plugin "kale" (Drupal\plugin_test\Plugin\plugin_test\fruit\Kale) in plugin_test should implement interface \Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface
@@ -258,7 +256,6 @@ public function testCreateInstanceWithInvalidInterfaces() {
    * Tests plugins without a required interface.
    *
    * @covers ::getDefinitions
-   * @covers ::enforcePluginInterface
    */
   public function testGetDefinitionsWithoutRequiredInterface() {
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
diff --git a/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php b/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
index 84b1661..77b73d7 100644
--- a/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
@@ -100,7 +100,7 @@ public function testMatchRequestDenied() {
   /**
    * Ensure that methods are passed to the wrapped router.
    *
-   * @covers ::__call
+   * @covers \Drupal\Core\Routing\AccessAwareRouter::__call
    */
   public function testCall() {
     $mock_router = $this->getMock('Symfony\Component\Routing\RouterInterface');