diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
index 5d91526..96cb123 100644
--- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Container Drupal\Tests\Component\Utility\UserAgentTest
+ * Contains Drupal\Tests\Component\Utility\HtmlTest.
  */
 
 namespace Drupal\Tests\Component\Utility;
@@ -11,11 +11,8 @@
 use Drupal\Tests\UnitTestCase;
 
 /**
- * Tests the http query methods.
- *
- * @group Utility
- *
  * @coversDefaultClass \Drupal\Component\Utility\Html
+ * @group Utility
  */
 class HtmlTest extends UnitTestCase {
 
@@ -24,13 +21,8 @@ class HtmlTest extends UnitTestCase {
    *
    * @dataProvider providerTestLoad
    * @covers ::load
-   *
-   * @param string $html
-   *   Original HTML.
-   * @param array $tags
-   *   A list of tags to find. Key is tag, value is number instances.
    */
-  public function testLoad($html, $tags) {
+  public function testLoad($html, $tags, $unused) {
     $doc = Html::load($html);
     // If we have a document we did our job.
     $this->assertInstanceOf('\DomDocument', $doc);
@@ -46,25 +38,30 @@ public function testLoad($html, $tags) {
    *
    * @dataProvider providerTestLoad
    * @covers ::serialize
-   *
-   * @param string $html
-   *   Original HTML.
-   * @param array $tags
-   *   A list of tags to find. Key is tag, value is number instances.
-   * @param $expected
-   *   Expected serialized value.
    */
   public function testSerialize($html, $tags, $expected) {
     $doc = Html::load($html);
     $this->assertEquals($expected, Html::serialize($doc));
   }
 
+  /**
+   * Data provider for a number of tests in this class.
+   *
+   * @return array
+   *   - Original HTML.
+   *   - A list of tags to find. Key is tag, value is number instances.
+   *   - Expected normalized value.
+   */
   public function providerTestLoad() {
     return array(
       array('<a>', array('a' => 1), '<a></a>'),
       array('<a href>', array('a' => 1), '<a href=""></a>'),
-      // Bad html
-      array('<div><something></something><something></something></some>', array('div' => 1, 'something' => 2), '<div><something></something><something></something></div>'),
+      // Bad html.
+      array(
+        '<div><something></something><something></something></some>',
+        array('div' => 1, 'something' => 2),
+        '<div><something></something><something></something></div>',
+      ),
       array('<astring', array('astring' => 1), '<astring></astring>'),
     );
   }
@@ -74,13 +71,6 @@ public function providerTestLoad() {
    *
    * @dataProvider providerTestLoad
    * @covers ::normalize
-   *
-   * @param string $html
-   *   Original HTML.
-   * @param array $tags
-   *   A list of tags to find. Key is tag, value is number instances.
-   * @param $expected
-   *   Expected normalized value.
    */
   public function testNormalize($html, $tags, $expected) {
     $this->assertEquals($expected, Html::normalize($html));