diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
index a30b1b5..ee9b691 100644
--- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -109,11 +109,11 @@ public function testGetClass() {
    * @param bool $reset
    *   (optional) If TRUE, reset the list of seen IDs. Defaults to FALSE.
    *
-   * @dataProvider providerTestHtmlGetUniqueId
+   * @dataProvider providerTestGetUniqueId
    *
    * @covers ::getUniqueId
    */
-  public function testHtmlGetUniqueId($expected, $source, $reset = FALSE) {
+  public function testGetUniqueId($expected, $source, $reset = FALSE) {
     if ($reset) {
       Html::resetSeenIds();
     }
@@ -126,7 +126,7 @@ public function testHtmlGetUniqueId($expected, $source, $reset = FALSE) {
    * @return array
    *   Test data.
    */
-  public function providerTestHtmlGetUniqueId() {
+  public function providerTestGetUniqueId() {
     $id = 'abcdefghijklmnopqrstuvwxyz-0123456789';
     return array(
       // Verify that letters, digits, and hyphens are not stripped from the ID.
@@ -152,11 +152,11 @@ public function providerTestHtmlGetUniqueId() {
    * @param bool $reset
    *   (optional) If TRUE, reset the list of seen IDs. Defaults to FALSE.
    *
-   * @dataProvider providerTestHtmlGetUniqueIdWithAjaxIds
+   * @dataProvider providerTestGetUniqueIdWithAjaxIds
    *
    * @covers ::getUniqueId
    */
-  public function testHtmlGetUniqueIdWithAjaxIds($expected, $source, $reset = FALSE) {
+  public function testGetUniqueIdWithAjaxIds($expected, $source, $reset = FALSE) {
     if ($reset) {
       Html::resetSeenIds();
     }
@@ -170,7 +170,7 @@ public function testHtmlGetUniqueIdWithAjaxIds($expected, $source, $reset = FALS
    * @return array
    *   Test data.
    */
-  public function providerTestHtmlGetUniqueIdWithAjaxIds() {
+  public function providerTestGetUniqueIdWithAjaxIds() {
     return array(
       array('test-unique-id1--2', 'test-unique-id1', TRUE),
       array('test-unique-id1--3', 'test-unique-id1'),
@@ -187,11 +187,11 @@ public function providerTestHtmlGetUniqueIdWithAjaxIds() {
    * @param string $source
    *   The string being transformed to an ID.
    *
-   * @dataProvider providerTestHtmlGetId
+   * @dataProvider providerTestGetId
    *
    * @covers ::getId
    */
-  public function testHtmlGetId($expected, $source) {
+  public function testGetId($expected, $source) {
     $this->assertSame($expected, Html::getId($source));
   }
 
@@ -201,7 +201,7 @@ public function testHtmlGetId($expected, $source) {
    * @return array
    *   Test data.
    */
-  public function providerTestHtmlGetId() {
+  public function providerTestGetId() {
     $id = 'abcdefghijklmnopqrstuvwxyz-0123456789';
     return array(
       // Verify that letters, digits, and hyphens are not stripped from the ID.