diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php
index 3190e8b..4a2e9ca 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php
@@ -11,6 +11,14 @@
  * Tests actions provided by the Comment module.
  */
 class CommentActionsTest extends CommentTestBase {
+
+  /**
+   * 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/CommentBlockTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
index fc6aabe..0ec3af2 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
@@ -11,6 +11,28 @@
  * Tests the Comment module blocks.
  */
 class CommentBlockTest extends CommentTestBase {
+
+  /**
+   * 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/CommentInterfaceTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
index a2e5dfd..ec07671 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\comment\Tests;
 
 class CommentInterfaceTest extends CommentTestBase {
+
   public static function getInfo() {
     return array(
       'name' => 'Comment interface',
@@ -16,6 +17,13 @@ public static function getInfo() {
     );
   }
 
+  function setUp() {
+    parent::setUp();
+
+    // Use the node listing as the front page.
+    config('system.site')->set('page.front', 'node')->save();
+  }
+
   /**
    * Tests the comment interface.
    */
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
index 60216ab..1a6cafd 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
@@ -17,9 +17,7 @@
    *
    * @var array
    */
-  public static $modules = array('comment', 'search');
-
-  protected $profile = 'standard';
+  public static $modules = array('comment', 'node');
 
   protected $admin_user;
   protected $web_user;
@@ -28,10 +26,32 @@
   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'));
+    // 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));
+
   }
 
   /**