diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
index 87b7949..2b67b15 100644
--- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -11,8 +11,6 @@
 use Drupal\Tests\UnitTestCase;
 
 /**
- * Tests \Drupal\Component\Utility\Html.
- *
  * @group Utility
  *
  * @coversDefaultClass \Drupal\Component\Utility\Html
@@ -32,7 +30,7 @@ protected function setUp() {
   }
 
   /**
-   * @dataProvider providerTestCleanCssIdentifier
+   * @dataProvider providerCleanCssIdentifier
    * @covers ::cleanCssIdentifier
    */
   public function testCleanCssIdentifier($expected, $source, $filter = NULL) {
@@ -53,7 +51,7 @@ public function testCleanCssIdentifier($expected, $source, $filter = NULL) {
    *   - (optional) An array of string replacements to use on the identifier. If
    *     NULL, no filter will be passed and a default will be used.
    */
-  public function providerTestCleanCssIdentifier() {
+  public function providerCleanCssIdentifier() {
     $id1 = 'abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789';
     $id2 = '¡¢£¤¥';
     $id3 = 'css__identifier__with__double__underscores';
@@ -82,8 +80,6 @@ public function providerTestCleanCssIdentifier() {
   }
 
   /**
-   * Tests that Html::getClass() cleans the class name properly.
-   *
    * @covers ::getClass
    */
   public function testGetClass() {
@@ -92,7 +88,7 @@ public function testGetClass() {
   }
 
   /**
-   * @dataProvider providerTestGetUniqueId
+   * @dataProvider providerGetUniqueId
    * @covers ::getUniqueId
    */
   public function testGetUniqueId($expected, $source, $reset = FALSE) {
@@ -110,7 +106,7 @@ public function testGetUniqueId($expected, $source, $reset = FALSE) {
    *   - The string being transformed to an ID.
    *   - (optional) If TRUE, reset the list of seen IDs. Defaults to FALSE.
    */
-  public function providerTestGetUniqueId() {
+  public function providerGetUniqueId() {
     $id = 'abcdefghijklmnopqrstuvwxyz-0123456789';
     return array(
       // Verify that letters, digits, and hyphens are not stripped from the ID.
@@ -128,7 +124,7 @@ public function providerTestGetUniqueId() {
   }
 
   /**
-   * @dataProvider providerTestGetUniqueIdWithAjaxIds
+   * @dataProvider providerGetUniqueIdWithAjaxIds
    * @covers ::getUniqueId
    */
   public function testGetUniqueIdWithAjaxIds($expected, $source, $reset = FALSE) {
@@ -147,7 +143,7 @@ public function testGetUniqueIdWithAjaxIds($expected, $source, $reset = FALSE) {
    *   - The string being transformed to an ID.
    *   - (optional) If TRUE, reset the list of seen IDs. Defaults to FALSE.
    */
-  public function providerTestGetUniqueIdWithAjaxIds() {
+  public function providerGetUniqueIdWithAjaxIds() {
     return array(
       array('test-unique-id1--2', 'test-unique-id1', TRUE),
       array('test-unique-id1--3', 'test-unique-id1'),
@@ -157,7 +153,7 @@ public function providerTestGetUniqueIdWithAjaxIds() {
   }
 
   /**
-   * @dataProvider providerTestGetId
+   * @dataProvider providerGetId
    * @covers ::getId
    */
   public function testGetId($expected, $source) {
@@ -171,7 +167,7 @@ public function testGetId($expected, $source) {
    *   - The expected result.
    *   - The string being transformed to an ID.
    */
-  public function providerTestGetId() {
+  public function providerGetId() {
     $id = 'abcdefghijklmnopqrstuvwxyz-0123456789';
     return array(
       // Verify that letters, digits, and hyphens are not stripped from the ID.
@@ -194,7 +190,7 @@ public function providerTestGetId() {
    *   - A list of tags to find. Key is tag, value is number instances.
    *   - Expected normalized value.
    */
-  public function providerTestLoad() {
+  public function providerLoad() {
     return array(
       array('<a>', array('a' => 1), '<a></a>'),
       array('<a href>', array('a' => 1), '<a href=""></a>'),
@@ -209,7 +205,7 @@ public function providerTestLoad() {
   }
 
   /**
-   * @dataProvider providerTestLoad
+   * @dataProvider providerLoad
    * @covers ::load
    */
   public function testLoad($html, $tags, $unused) {
@@ -224,7 +220,7 @@ public function testLoad($html, $tags, $unused) {
   }
 
   /**
-   * @dataProvider providerTestLoad
+   * @dataProvider providerLoad
    * @covers ::serialize
    */
   public function testSerialize($html, $tags, $expected) {
@@ -233,7 +229,7 @@ public function testSerialize($html, $tags, $expected) {
   }
 
   /**
-   * @dataProvider providerTestLoad
+   * @dataProvider providerLoad
    * @covers ::normalize
    */
   public function testNormalize($html, $tags, $expected) {