diff --git a/core/modules/comment/comment.test b/core/modules/comment/comment.test
index 23b3497..a791b2d 100644
--- a/core/modules/comment/comment.test
+++ b/core/modules/comment/comment.test
@@ -6,7 +6,7 @@
  */
 
 use Drupal\comment\Comment;
-use Drupal\comment\CommentTestBase;
+use Drupal\comment\Tests\CommentTestBase;
 use Drupal\simpletest\WebTestBase;
 
 class CommentInterfaceTest extends CommentTestBase {
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php
index aba9626..b000e12 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Tests;
 
-use Drupal\comment\CommentTestBase;
+use Drupal\comment\Tests\CommentTestBase;
 use Drupal\simpletest\WebTestBase;
 
 /**
diff --git a/core/modules/rdf/rdf.test b/core/modules/rdf/rdf.test
index 0c60f41..564408e 100644
--- a/core/modules/rdf/rdf.test
+++ b/core/modules/rdf/rdf.test
@@ -7,6 +7,7 @@
 
 use Drupal\node\Node;
 use Drupal\simpletest\WebTestBase;
+use Drupal\comment\Tests\CommentTestBase;
 
 class RdfMappingHookTestCase extends WebTestBase {
   public static function getInfo() {
@@ -416,7 +417,7 @@ class RdfMappingDefinitionTestCase extends TaxonomyWebTestCase {
   }
 }
 
-class RdfCommentAttributesTestCase extends CommentHelperCase {
+class RdfCommentAttributesTestCase extends CommentTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/user/user.test b/core/modules/user/user.test
index 7671eba..57a3713 100644
--- a/core/modules/user/user.test
+++ b/core/modules/user/user.test
@@ -1946,7 +1946,7 @@ class UserSignatureTestCase extends WebTestBase {
     $this->drupalPost(NULL, array(), t('Save'));
 
     // Get the comment ID. (This technique is the same one used in the Comment
-    // module's CommentHelperCase test case.)
+    // module's CommentTestBase test case.)
     preg_match('/#comment-([0-9]+)/', $this->getURL(), $match);
     $comment_id = $match[1];