diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php
index 3190e8b..dfc6163 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php
@@ -10,7 +10,15 @@
 /**
  * Tests actions provided by the Comment module.
  */
-class CommentActionsTest extends CommentTestBase {
+class CommentActionsTest extends CommentTestingTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('dblog');
+
   public static function getInfo() {
     return array(
       'name' => 'Comment actions',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentAnonymousTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentAnonymousTest.php
index 66eba33..5746953 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentAnonymousTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentAnonymousTest.php
@@ -10,7 +10,8 @@
 /**
  * Tests anonymous commenting.
  */
-class CommentAnonymousTest extends CommentTestBase {
+class CommentAnonymousTest extends CommentStandardTestBase {
+
   public static function getInfo() {
     return array(
       'name' => 'Anonymous comments',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentApprovalTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentApprovalTest.php
index 62a7812..cb5b51f 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentApprovalTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentApprovalTest.php
@@ -10,7 +10,7 @@
 /**
  * Tests comment approval functionality.
  */
-class CommentApprovalTest extends CommentTestBase {
+class CommentApprovalTest extends CommentTestingTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Comment approval',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
index fc6aabe..7fa0298 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
@@ -10,7 +10,29 @@
 /**
  * Tests the Comment module blocks.
  */
-class CommentBlockTest extends CommentTestBase {
+class CommentBlockTest extends CommentTestingTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('block');
+
+  function setUp() {
+    parent::setUp();
+    // Update admin user to have the 'administer blocks' permission.
+    $this->admin_user = $this->drupalCreateUser(array(
+      'administer content types',
+      'administer comments',
+      'skip comment approval',
+      'post comments',
+      'access comments',
+      'access content',
+      'administer blocks',
+     ));
+  }
+
   public static function getInfo() {
     return array(
       'name' => 'Comment blocks',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php
new file mode 100644
index 0000000..d71393e
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\comment\Tests\CommentCSSTest.
+ */
+
+namespace Drupal\comment\Tests;
+
+/**
+ * Tests comment CSS classes.
+ */
+class CommentCSSTest extends CommentStandardTestBase {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Comment interface',
+      'description' => 'Test comment user interfaces.',
+      'group' => 'Comment',
+    );
+  }
+
+  /**
+   * Tests CSS classes on comments.
+   */
+  function testCommentClasses() {
+    // Create all permutations for comments, users, and nodes.
+    $parameters = array(
+      'node_uid' => array(0, $this->web_user->uid),
+      'comment_uid' => array(0, $this->web_user->uid, $this->admin_user->uid),
+      'comment_status' => array(COMMENT_PUBLISHED, COMMENT_NOT_PUBLISHED),
+      'user' => array('anonymous', 'authenticated', 'admin'),
+    );
+    $permutations = $this->generatePermutations($parameters);
+
+    foreach ($permutations as $case) {
+      // Create a new node.
+      $node = $this->drupalCreateNode(array('type' => 'article', 'uid' => $case['node_uid']));
+
+      // Add a comment.
+      $comment = entity_create('comment', array(
+        'nid' => $node->nid,
+        'uid' => $case['comment_uid'],
+        'status' => $case['comment_status'],
+        'subject' => $this->randomName(),
+        'language' => LANGUAGE_NOT_SPECIFIED,
+        'comment_body' => array(LANGUAGE_NOT_SPECIFIED => array($this->randomName())),
+      ));
+      comment_save($comment);
+
+      // Adjust the current/viewing user.
+      switch ($case['user']) {
+        case 'anonymous':
+          if ($this->loggedInUser) {
+            $this->drupalLogout();
+          }
+          $case['user_uid'] = 0;
+          break;
+
+        case 'authenticated':
+          $this->drupalLogin($this->web_user);
+          $case['user_uid'] = $this->web_user->uid;
+          break;
+
+        case 'admin':
+          $this->drupalLogin($this->admin_user);
+          $case['user_uid'] = $this->admin_user->uid;
+          break;
+      }
+      // Request the node with the comment.
+      $this->drupalGet('node/' . $node->nid);
+
+      // Verify classes if the comment is visible for the current user.
+      if ($case['comment_status'] == COMMENT_PUBLISHED || $case['user'] == 'admin') {
+        // Verify the by-anonymous class.
+        $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-anonymous")]');
+        if ($case['comment_uid'] == 0) {
+          $this->assertTrue(count($comments) == 1, 'by-anonymous class found.');
+        }
+        else {
+          $this->assertFalse(count($comments), 'by-anonymous class not found.');
+        }
+
+        // Verify the by-node-author class.
+        $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-node-author")]');
+        if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['node_uid']) {
+          $this->assertTrue(count($comments) == 1, 'by-node-author class found.');
+        }
+        else {
+          $this->assertFalse(count($comments), 'by-node-author class not found.');
+        }
+
+        // Verify the by-viewer class.
+        $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-viewer")]');
+        if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['user_uid']) {
+          $this->assertTrue(count($comments) == 1, 'by-viewer class found.');
+        }
+        else {
+          $this->assertFalse(count($comments), 'by-viewer class not found.');
+        }
+      }
+
+      // Verify the unpublished class.
+      $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "unpublished")]');
+      if ($case['comment_status'] == COMMENT_NOT_PUBLISHED && $case['user'] == 'admin') {
+        $this->assertTrue(count($comments) == 1, 'unpublished class found.');
+      }
+      else {
+        $this->assertFalse(count($comments), 'unpublished class not found.');
+      }
+
+      // Verify the new class.
+      if ($case['comment_status'] == COMMENT_PUBLISHED || $case['user'] == 'admin') {
+        $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "new")]');
+        if ($case['user'] != 'anonymous') {
+          $this->assertTrue(count($comments) == 1, 'new class found.');
+
+          // Request the node again. The new class should disappear.
+          $this->drupalGet('node/' . $node->nid);
+          $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "new")]');
+          $this->assertFalse(count($comments), 'new class not found.');
+        }
+        else {
+          $this->assertFalse(count($comments), 'new class not found.');
+        }
+      }
+    }
+  }
+
+}
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentContentRebuildTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentContentRebuildTest.php
index 980efc7..2f19e53 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentContentRebuildTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentContentRebuildTest.php
@@ -10,7 +10,7 @@
 /**
  * Tests comment content rebuilding.
  */
-class CommentContentRebuildTest extends CommentTestBase {
+class CommentContentRebuildTest extends CommentTestingTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Comment Rebuild',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php
index 43f9cc3..a77cc78 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php
@@ -10,7 +10,15 @@
 /**
  * Tests fields on comments.
  */
-class CommentFieldsTest extends CommentTestBase {
+class CommentFieldsTest extends CommentTestingTestBase {
+
+  /**
+   * Enable the field UI.
+   *
+   * @var array
+   */
+  public static $modules = array('field_ui');
+
   public static function getInfo() {
     return array(
       'name' => 'Comment fields',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
index a2e5dfd..e8d9158 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
@@ -7,7 +7,8 @@
 
 namespace Drupal\comment\Tests;
 
-class CommentInterfaceTest extends CommentTestBase {
+class CommentInterfaceTest extends CommentTestingTestBase {
+
   public static function getInfo() {
     return array(
       'name' => 'Comment interface',
@@ -16,6 +17,10 @@ public static function getInfo() {
     );
   }
 
+  function setUp() {
+    parent::setUp();
+  }
+
   /**
    * Tests the comment interface.
    */
@@ -226,113 +231,6 @@ public function testCommentNewCommentsIndicator() {
   }
 
   /**
-   * Tests CSS classes on comments.
-   */
-  function testCommentClasses() {
-    // Create all permutations for comments, users, and nodes.
-    $parameters = array(
-      'node_uid' => array(0, $this->web_user->uid),
-      'comment_uid' => array(0, $this->web_user->uid, $this->admin_user->uid),
-      'comment_status' => array(COMMENT_PUBLISHED, COMMENT_NOT_PUBLISHED),
-      'user' => array('anonymous', 'authenticated', 'admin'),
-    );
-    $permutations = $this->generatePermutations($parameters);
-
-    foreach ($permutations as $case) {
-      // Create a new node.
-      $node = $this->drupalCreateNode(array('type' => 'article', 'uid' => $case['node_uid']));
-
-      // Add a comment.
-      $comment = entity_create('comment', array(
-        'nid' => $node->nid,
-        'uid' => $case['comment_uid'],
-        'status' => $case['comment_status'],
-        'subject' => $this->randomName(),
-        'language' => LANGUAGE_NOT_SPECIFIED,
-        'comment_body' => array(LANGUAGE_NOT_SPECIFIED => array($this->randomName())),
-      ));
-      comment_save($comment);
-
-      // Adjust the current/viewing user.
-      switch ($case['user']) {
-        case 'anonymous':
-          if ($this->loggedInUser) {
-            $this->drupalLogout();
-          }
-          $case['user_uid'] = 0;
-          break;
-
-        case 'authenticated':
-          $this->drupalLogin($this->web_user);
-          $case['user_uid'] = $this->web_user->uid;
-          break;
-
-        case 'admin':
-          $this->drupalLogin($this->admin_user);
-          $case['user_uid'] = $this->admin_user->uid;
-          break;
-      }
-      // Request the node with the comment.
-      $this->drupalGet('node/' . $node->nid);
-
-      // Verify classes if the comment is visible for the current user.
-      if ($case['comment_status'] == COMMENT_PUBLISHED || $case['user'] == 'admin') {
-        // Verify the by-anonymous class.
-        $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-anonymous")]');
-        if ($case['comment_uid'] == 0) {
-          $this->assertTrue(count($comments) == 1, 'by-anonymous class found.');
-        }
-        else {
-          $this->assertFalse(count($comments), 'by-anonymous class not found.');
-        }
-
-        // Verify the by-node-author class.
-        $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-node-author")]');
-        if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['node_uid']) {
-          $this->assertTrue(count($comments) == 1, 'by-node-author class found.');
-        }
-        else {
-          $this->assertFalse(count($comments), 'by-node-author class not found.');
-        }
-
-        // Verify the by-viewer class.
-        $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-viewer")]');
-        if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['user_uid']) {
-          $this->assertTrue(count($comments) == 1, 'by-viewer class found.');
-        }
-        else {
-          $this->assertFalse(count($comments), 'by-viewer class not found.');
-        }
-      }
-
-      // Verify the unpublished class.
-      $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "unpublished")]');
-      if ($case['comment_status'] == COMMENT_NOT_PUBLISHED && $case['user'] == 'admin') {
-        $this->assertTrue(count($comments) == 1, 'unpublished class found.');
-      }
-      else {
-        $this->assertFalse(count($comments), 'unpublished class not found.');
-      }
-
-      // Verify the new class.
-      if ($case['comment_status'] == COMMENT_PUBLISHED || $case['user'] == 'admin') {
-        $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "new")]');
-        if ($case['user'] != 'anonymous') {
-          $this->assertTrue(count($comments) == 1, 'new class found.');
-
-          // Request the node again. The new class should disappear.
-          $this->drupalGet('node/' . $node->nid);
-          $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "new")]');
-          $this->assertFalse(count($comments), 'new class not found.');
-        }
-        else {
-          $this->assertFalse(count($comments), 'new class not found.');
-        }
-      }
-    }
-  }
-
-  /**
    * Tests the node comment statistics.
    */
   function testCommentNodeCommentStatistics() {
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeAccessTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeAccessTest.php
index d357bd0..63ba2ac 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeAccessTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeAccessTest.php
@@ -12,11 +12,10 @@
 /**
  * Tests comments with node access.
  *
- * See http://drupal.org/node/886752 -- verify there is no PostgreSQL error when
- * viewing a node with threaded comments (a comment and a reply), if a node
- * access module is in use.
+ * Verifies there is no PostgreSQL error when viewing a node with threaded
+ * comments (a comment and a reply), if a node access module is in use.
  */
-class CommentNodeAccessTest extends CommentTestBase {
+class CommentNodeAccessTest extends CommentTestingTestBase {
 
   /**
    * Modules to enable.
@@ -39,7 +38,14 @@ function setUp() {
     node_access_rebuild();
 
     // Re-create user.
-    $this->web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'create article content', 'edit own comments', 'node test view'));
+    $this->web_user = $this->drupalCreateUser(array(
+      'access comments',
+      'post comments',
+      'create article content',
+      'edit own comments',
+      'node test view',
+      'skip comment approval',
+    ));
   }
 
   /**
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php
index b517d04..d79b672 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php
@@ -10,7 +10,7 @@
 /**
  * Tests that comments behave correctly when the node is changed.
  */
-class CommentNodeChangesTest extends CommentTestBase {
+class CommentNodeChangesTest extends CommentTestingTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php
index 52f1e32..9bed7db 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php
@@ -10,7 +10,7 @@
 /**
  * Verifies pagination of comments.
  */
-class CommentPagerTest extends CommentTestBase {
+class CommentPagerTest extends CommentTestingTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Comment paging settings',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
index e9ca2d9..33b564a 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
@@ -10,7 +10,8 @@
 /**
  * Tests previewing comments.
  */
-class CommentPreviewTest extends CommentTestBase {
+class CommentPreviewTest extends CommentStandardTestBase {
+
   public static function getInfo() {
     return array(
       'name' => 'Comment preview',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php
index 28e199e..184d6ba 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php
@@ -10,7 +10,7 @@
 /**
  * Tests for Comment module integration with RSS feeds.
  */
-class CommentRssTest extends CommentTestBase {
+class CommentRssTest extends CommentTestingTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Comment RSS',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentStandardTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentStandardTestBase.php
new file mode 100644
index 0000000..77ce335
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentStandardTestBase.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\comment\Tests\CommentStandardTestBase.
+ */
+
+namespace Drupal\comment\Tests;
+
+use Drupal\comment\Comment;
+use Drupal\simpletest\WebTestBase;
+
+abstract class CommentStandardTestBase extends CommentTestBase {
+
+  /**
+   * Use the standard profile.
+   *
+   * @var string
+   */
+  protected $profile = 'standard';
+
+  function setUp() {
+    parent::setUp();
+
+    // Create two test users.
+    $this->admin_user = $this->drupalCreateUser(array(
+      'administer content types',
+      'administer comments',
+      'skip comment approval',
+      'post comments',
+      'access comments',
+      'access content',
+     ));
+    $this->web_user = $this->drupalCreateUser(array(
+      'access comments',
+      'post comments',
+      'create article content',
+      'edit own comments',
+      'post comments',
+      'skip comment approval',
+      'access comments',
+      'access content',
+    ));
+
+    // Create a test node authored by the web user.
+    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->web_user->uid));
+
+  }
+
+}
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
index 60216ab..4f2450f 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
@@ -12,28 +12,10 @@
 
 abstract class CommentTestBase extends WebTestBase {
 
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('comment', 'search');
-
-  protected $profile = 'standard';
-
   protected $admin_user;
   protected $web_user;
   protected $node;
 
-  function setUp() {
-    parent::setUp();
-
-    // Create users and test node.
-    $this->admin_user = $this->drupalCreateUser(array('administer content types', 'administer comments', 'administer blocks'));
-    $this->web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'create article content', 'edit own comments'));
-    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->web_user->uid));
-  }
-
   /**
    * Posts a comment.
    *
@@ -122,7 +104,6 @@ function commentExists(Comment $comment = NULL, $reply = FALSE) {
     if ($comment) {
       $regex = '/' . ($reply ? '<div class="indented">(.*?)' : '');
       $regex .= '<a id="comment-' . $comment->id . '"(.*?)'; // Comment anchor.
-      $regex .= '<div(.*?)'; // Begin in comment div.
       $regex .= $comment->subject . '(.*?)'; // Match subject.
       $regex .= $comment->comment . '(.*?)'; // Match comment.
       $regex .= '/s';
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestingTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestingTestBase.php
new file mode 100644
index 0000000..870cd03
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestingTestBase.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\comment\Tests\CommentTestingTestBase.
+ */
+
+namespace Drupal\comment\Tests;
+
+use Drupal\comment\Comment;
+use Drupal\simpletest\WebTestBase;
+
+abstract class CommentTestingTestBase extends CommentTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('comment', 'node');
+
+  function setUp() {
+    parent::setUp();
+
+    // Create the article content type and a test node.
+    $this->drupalCreateContentType(array('type' => 'article', 'name' => t('Article')));
+
+    // Create two test users.
+    $this->admin_user = $this->drupalCreateUser(array(
+      'administer content types',
+      'administer comments',
+      'skip comment approval',
+      'post comments',
+      'access comments',
+      'access content',
+     ));
+    $this->web_user = $this->drupalCreateUser(array(
+      'access comments',
+      'post comments',
+      'create article content',
+      'edit own comments',
+      'post comments',
+      'skip comment approval',
+      'access comments',
+      'access content',
+    ));
+
+    // Create a test node authored by the web user.
+    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->web_user->uid));
+  }
+
+}
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
index 7f4edd5..dabf1a5 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
@@ -10,7 +10,7 @@
 /**
  * Tests comment threading.
  */
-class CommentThreadingTest extends CommentTestBase {
+class CommentThreadingTest extends CommentTestingTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Comment Threading',
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTokenReplaceTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTokenReplaceTest.php
index 34674e8..8b815c3 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentTokenReplaceTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTokenReplaceTest.php
@@ -10,7 +10,7 @@
 /**
  * Tests comment token replacement in strings.
  */
-class CommentTokenReplaceTest extends CommentTestBase {
+class CommentTokenReplaceTest extends CommentTestingTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Comment token replacement',
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
index 01c8069..00be408 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
@@ -7,12 +7,12 @@
 
 namespace Drupal\rdf\Tests;
 
-use Drupal\comment\Tests\CommentTestBase;
+use Drupal\comment\Tests\CommentStandardTestBase;
 
 /**
  * Tests the RDFa markup of comments.
  */
-class CommentAttributesTest extends CommentTestBase {
+class CommentAttributesTest extends CommentStandardTestBase {
 
   /**
    * Modules to enable.