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..9756679 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
    */
@@ -53,7 +53,8 @@ public function testValidateTags(array $tags, $expected_exception_message) {
     if ($expected_exception_message !== FALSE) {
       $this->setExpectedException('LogicException', $expected_exception_message);
     }
-    Cache::validateTags($tags);
+    // If it doesn't throw an exception, validateTags() returns NULL.
+    $this->assertNull(Cache::validateTags($tags));
   }
 
   /**
@@ -74,7 +75,7 @@ public function mergeTagsProvider() {
   }
 
   /**
-   * @covers mergeTags
+   * @covers ::mergeTags
    *
    * @dataProvider mergeTagsProvider
    */
@@ -108,7 +109,7 @@ public function buildTagsProvider() {
   }
 
   /**
-   * @covers buildTags
+   * @covers ::buildTags
    *
    * @dataProvider buildTagsProvider
    */
@@ -117,7 +118,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 +128,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..16a4e42 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');
@@ -252,6 +293,7 @@ public function testUrlGenerator() {
   /**
    * 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');
@@ -278,6 +322,7 @@ public function testLinkGenerator() {
   /**
    * 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/Entity/BaseFieldDefinitionTest.php b/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
index bc88b21..cc4e7d6 100644
--- a/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
@@ -46,7 +46,7 @@ protected function setUp() {
     $this->fieldTypeDefinition = array(
       'id' => $this->fieldType,
       'storage_settings' => array(
-        'some_setting' => 'value 1'
+        'some_setting' => 'value 1',
       ),
       'field_settings' => array(
         'some_instance_setting' => 'value 2',
@@ -270,7 +270,7 @@ public function testCustomStorage() {
   public function testDefaultValueCallback() {
     $definition = BaseFieldDefinition::create($this->fieldType);
     $callback = get_class($this) . '::mockDefaultValueCallback';
-    $definition->setDefaultValueCallback($callback);
+    $this->assertNotNull($definition->setDefaultValueCallback($callback));
   }
 
   /**
@@ -281,7 +281,9 @@ public function testDefaultValueCallback() {
    */
   public function testInvalidDefaultValueCallback() {
     $definition = BaseFieldDefinition::create($this->fieldType);
-    $definition->setDefaultValueCallback([get_class($this), 'mockDefaultValueCallback']);
+    $this->assertNotNull(
+      $definition->setDefaultValueCallback([get_class($this), 'mockDefaultValueCallback'])
+    );
   }
 
   /**
@@ -291,7 +293,7 @@ public function testInvalidDefaultValueCallback() {
    */
   public function testNullDefaultValueCallback() {
     $definition = BaseFieldDefinition::create($this->fieldType);
-    $definition->setDefaultValueCallback(NULL);
+    $this->assertNotNull($definition->setDefaultValueCallback(NULL));
   }
 
   /**
@@ -305,7 +307,7 @@ public function testNullDefaultValueCallback() {
    * @return string
    *   Default value.
    */
-  public static function mockDefaultValueCallback($entity, $definition) {
+  public static function mockDefaultValueCallback(EntityInterface $entity, FieldDefinitionInterface $definition) {
     return 'a default value';
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index 788744f..1656a3c 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()
@@ -94,6 +92,7 @@ protected function setUp() {
    * @covers ::addDefaultLangcodeSchema()
    * @covers ::processBaseTable()
    * @covers ::processIdentifierSchema()
+   * @covers ::onEntityTypeCreate()
    */
   public function testGetSchemaBase() {
     $this->entityType = new ContentEntityType(array(
@@ -382,14 +381,15 @@ public function testGetSchemaBase() {
       ->method('getTableMapping')
       ->will($this->returnValue($table_mapping));
 
-    $this->storageSchema->onEntityTypeCreate($this->entityType);
+    $this->assertNull(
+      $this->storageSchema->onEntityTypeCreate($this->entityType)
+    );
   }
 
   /**
    * Tests the schema for revisionable, non-translatable entities.
    *
    * @covers ::__construct()
-   * @covers ::getSchema()
    * @covers ::getEntitySchemaTables()
    * @covers ::initializeBaseTable()
    * @covers ::initializeRevisionTable()
@@ -397,6 +397,7 @@ public function testGetSchemaBase() {
    * @covers ::getEntityIndexName()
    * @covers ::processRevisionTable()
    * @covers ::processIdentifierSchema()
+   * @covers ::onEntityTypeCreate()
    */
   public function testGetSchemaRevisionable() {
     $this->entityType = new ContentEntityType(array(
@@ -489,7 +490,6 @@ public function testGetSchemaRevisionable() {
    * Tests the schema for non-revisionable, translatable entities.
    *
    * @covers ::__construct()
-   * @covers ::getSchema()
    * @covers ::getEntitySchemaTables()
    * @covers ::initializeDataTable()
    * @covers ::addTableDefaults()
@@ -572,14 +572,15 @@ public function testGetSchemaTranslatable() {
       ->method('getTableMapping')
       ->will($this->returnValue($table_mapping));
 
-    $this->storageSchema->onEntityTypeCreate($this->entityType);
+    $this->assertNull(
+      $this->storageSchema->onEntityTypeCreate($this->entityType)
+    );
   }
 
   /**
    * Tests the schema for revisionable, translatable entities.
    *
    * @covers ::__construct()
-   * @covers ::getSchema()
    * @covers ::getEntitySchemaTables()
    * @covers ::initializeDataTable()
    * @covers ::addTableDefaults()
@@ -903,7 +904,9 @@ public function testDedicatedTableSchema() {
       ->method('getTableMapping')
       ->will($this->returnValue($table_mapping));
 
-    $this->storageSchema->onFieldStorageDefinitionCreate($field_storage);
+    $this->assertNull(
+      $this->storageSchema->onFieldStorageDefinitionCreate($field_storage)
+    );
   }
 
   /**
@@ -1048,7 +1051,9 @@ public function testDedicatedTableSchemaForEntityWithStringIdentifier() {
       ->method('getTableMapping')
       ->will($this->returnValue($table_mapping));
 
-    $this->storageSchema->onFieldStorageDefinitionCreate($field_storage);
+    $this->assertNull(
+      $this->storageSchema->onFieldStorageDefinitionCreate($field_storage)
+    );
   }
 
   /**
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..6ec541b 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
@@ -213,13 +213,12 @@ 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');
 
     foreach ($this->expectedDefinitions as $plugin_id => $definition) {
-      $plugin_manager->createInstance($plugin_id);
+      $this->assertNotNull($plugin_manager->createInstance($plugin_id));
     }
   }
 
@@ -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');
@@ -279,7 +276,7 @@ public function testGetDefinitionsWithoutRequiredInterface() {
     $this->expectedDefinitions['banana']['provider'] = 'plugin_test';
 
     $plugin_manager = new TestPluginManager($this->namespaces, $this->expectedDefinitions, $module_handler, NULL);
-    $plugin_manager->getDefinitions();
+    $this->assertInternalType('array', $plugin_manager->getDefinitions());
   }
 
 }
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 {
diff --git a/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php b/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php
index 231f833..f92109b 100644
--- a/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php
+++ b/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php
@@ -51,7 +51,7 @@ public function testNoProxy() {
   /**
    * Tests that subscriber sets trusted headers when reverse proxy is set.
    *
-   * @dataProvider testReverseProxyEnabledProvider
+   * @dataProvider reverseProxyEnabledProvider
    */
   public function testReverseProxyEnabled($provided_settings) {
       // Enable reverse proxy and add test values.
@@ -62,7 +62,7 @@ public function testReverseProxyEnabled($provided_settings) {
   /**
    * Data provider for testReverseProxyEnabled.
    */
-  public function testReverseProxyEnabledProvider() {
+  public function reverseProxyEnabledProvider() {
     return array(
       array(
         array(