diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php
new file mode 100644
index 0000000..e6fefd9
--- /dev/null
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php
@@ -0,0 +1,197 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\forum\Tests\ForumBlockTest.
+ */
+
+namespace Drupal\forum\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Provides automated tests for the Forum blocks.
+ */
+class ForumBlockTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('taxonomy', 'comment', 'forum', 'node', 'block', 'menu', 'help');
+
+  /**
+   * A user with various administrative privileges.
+   */
+  protected $adminUser;
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Forum blocks',
+      'description' => 'Tests the forum blocks.',
+      'group' => 'Forum',
+    );
+  }
+
+  function setUp() {
+    parent::setUp();
+
+    // Create users.
+    $this->adminUser = $this->drupalCreateUser(array(
+      'access administration pages',
+      'administer blocks',
+      'administer nodes',
+      'create forum content',
+      'post comments',
+      'skip comment approval',
+    ));
+  }
+
+  /**
+   * Tests disabling and re-enabling the Forum module.
+   */
+  function testNewForumTopicsBlock() {
+    $this->drupalLogin($this->adminUser);
+
+    // Create 5 forum topics.
+    $topics = $this->createForumTopics();
+
+    // Enable the new forum block.
+    $edit = array();
+    $edit['blocks[forum_new][region]'] = 'sidebar_second';
+    $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
+    $this->assertResponse(200);
+    $this->assertText(t('The block settings have been updated.'), t('"New forum topics" block was enabled'));
+    $this->assertLink(t('More'), 0, t('New forum topics block has a "more"-link.'));
+    $this->assertLinkByHref('forum', 0, t('New forum topics block has a "more"-link.'));
+
+    // We expect all 5 forum topics to appear in the "New forum topics" block.
+    foreach ($topics as $topic) {
+      $this->assertLink($topic, 0, t('Forum topic found in the "New forum topics" block.'));
+    }
+
+    // Configure the new forum block to only show 2 topics.
+    $edit = array();
+    $edit['block_new_limit'] = 2;
+    $this->drupalPost('admin/structure/block/manage/forum/new/configure', $edit, t('Save block'));
+    $this->assertResponse(200);
+
+    // We expect only the 2 most recent forum topics to appear in the "New forum
+    // topics" block.
+    for ($index = 0; $index < 5; $index++) {
+      if (in_array($index, array(3, 4))) {
+        $this->assertLink($topics[$index], 0, t('Forum topic @topic found in the "New forum topics" block.', array('@topic' => $topics[$index])));
+      }
+      else {
+        $this->assertNoText($topics[$index], t('Forum topic @topic not found in the "New forum topics" block.', array('@topic' => $topics[$index])));
+      }
+    }
+
+    // Disable the "New forum topics" block again.
+    $edit = array();
+    $edit['blocks[forum_new][region]'] = BLOCK_REGION_NONE;
+    $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
+    $this->assertResponse(200);
+    $this->assertText(t('The block settings have been updated.'), t('"New forum topics" block was disabled'));
+  }
+
+  function testActiveForumTopicsBlock() {
+    $this->drupalLogin($this->adminUser);
+
+    // Create 10 forum topics.
+    $topics = $this->createForumTopics(10);
+
+    // Comment on the first 5 topics.
+    $timestamp = time();
+    $langcode = LANGUAGE_NOT_SPECIFIED;
+    for ($index = 0; $index < 5; $index++) {
+      // Get the node from the topic title.
+      $node = $this->drupalGetNodeByTitle($topics[$index]);
+      $comment = entity_create('comment', array(
+        'nid' => $node->nid,
+        'subject' => $this->randomString(20),
+        'comment_body' => array(LANGUAGE_NOT_SPECIFIED => $this->randomString(256)),
+        'created' => $timestamp + $index,
+      ));
+      comment_save($comment);
+    }
+
+    // Enable the active forum block.
+    $edit = array();
+    $edit['blocks[forum_active][region]'] = 'sidebar_second';
+    $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
+    $this->assertResponse(200);
+    $this->assertText(t('The block settings have been updated.'), t('Active forum topics forum block was enabled'));
+    $this->assertLink(t('More'), 0, t('Active forum topics block has a "more"-link.'));
+    $this->assertLinkByHref('forum', 0, t('Active forum topics block has a "more"-link.'));
+
+    // We expect the first 5 forum topics to appear in the "Active forum topics"
+    // block.
+    $this->drupalGet('<front>');
+    for ($index = 0; $index < 10; $index++) {
+      if ($index < 5) {
+        $this->assertLink($topics[$index], 0, t('Forum topic @topic found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
+      }
+      else {
+        $this->assertNoText($topics[$index], t('Forum topic @topic not found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
+      }
+    }
+
+    // Configure the active forum block to only show 2 topics.
+    $edit = array();
+    $edit['block_active_limit'] = 2;
+    $this->drupalPost('admin/structure/block/manage/forum/active/configure', $edit, t('Save block'));
+    $this->assertResponse(200);
+
+    // We expect only the 2 forum topics with most recent comments to appear in
+    // the "Active forum topics" block.
+    for ($index = 0; $index < 10; $index++) {
+      if (in_array($index, array(3, 4))) {
+        $this->assertLink($topics[$index], 0, t('Forum topic found in the "Active forum topics" block.'));
+      }
+      else {
+        $this->assertNoText($topics[$index], t('Forum topic not found in the "Active forum topics" block.'));
+      }
+    }
+
+    // Disable the "Active forum topics" block again.
+    $edit = array();
+    $edit['blocks[forum_active][region]'] = BLOCK_REGION_NONE;
+    $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
+    $this->assertResponse(200);
+    $this->assertText(t('The block settings have been updated.'), t('"Active forum topics" block was disabled'));
+  }
+
+  /**
+   * Creates a forum topic.
+   *
+   * @return
+   *   The title of the newly generated topic.
+   */
+  private function createForumTopics($count = 5) {
+    $topics = array();
+    $timestamp = time() - 24 * 60 * 60;
+
+    for ($index = 0; $index < $count; $index++) {
+      // Generate a random subject/body.
+      $title = $this->randomName(20);
+      $body = $this->randomName(200);
+
+      $langcode = LANGUAGE_NOT_SPECIFIED;
+      $edit = array(
+        'title' => $title,
+        "body[$langcode][0][value]" => $body,
+        // Forum posts are ordered by timestamp, so force a unique timestamp by
+        // adding the index.
+        'date' => date('c', $timestamp + $index),
+      );
+
+      // Create the forum topic, preselecting the forum ID via a URL parameter.
+      $this->drupalPost('node/add/forum/1', $edit, t('Save'));
+      $topics[] = $title;
+    }
+
+    return $topics;
+  }
+}
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
index a09ce92..f0ea1d6 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
@@ -132,7 +132,7 @@ class ForumTest extends WebTestBase {
 
     // Do the admin tests.
     $this->doAdminTests($this->admin_user);
-    // Generate topics to populate the active forum block.
+
     $this->generateForumTopics($this->forum);
 
     // Login an unprivileged user to view the forum topics and generate an
@@ -142,7 +142,6 @@ class ForumTest extends WebTestBase {
     $this->drupalGet('forum/' . $this->forum['tid']);
     $this->assertText(t('You are not allowed to post new content in the forum'), "Authenticated user without permission to post forum content is shown message in local tasks to that effect.");
 
-    $this->viewForumTopics($this->nids);
 
     // Log in, and do basic tests for a user with permission to edit any forum
     // content.
@@ -250,20 +249,6 @@ class ForumTest extends WebTestBase {
     // Login the user.
     $this->drupalLogin($user);
 
-    // Enable the active forum block.
-    $edit = array();
-    $edit['blocks[forum_active][region]'] = 'sidebar_second';
-    $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
-    $this->assertResponse(200);
-    $this->assertText(t('The block settings have been updated.'), t('Active forum topics forum block was enabled'));
-
-    // Enable the new forum block.
-    $edit = array();
-    $edit['blocks[forum_new][region]'] = 'sidebar_second';
-    $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
-    $this->assertResponse(200);
-    $this->assertText(t('The block settings have been updated.'), t('[New forum topics] Forum block was enabled'));
-
     // Retrieve forum menu id.
     $mlid = db_query_range("SELECT mlid FROM {menu_links} WHERE link_path = 'forum' AND menu_name = 'navigation' AND module = 'system' ORDER BY mlid ASC", 0, 1)->fetchField();
 
@@ -524,11 +509,6 @@ class ForumTest extends WebTestBase {
       $this->assertText(t('Forum'), t('Forum help node was displayed'));
     }
 
-    // Verify the forum blocks were displayed.
-    $this->drupalGet('');
-    $this->assertResponse(200);
-    $this->assertText(t('New forum topics'), t('[New forum topics] Forum block was displayed'));
-
     // View forum container page.
     $this->verifyForumView($this->container);
     // View forum page.
@@ -607,7 +587,7 @@ class ForumTest extends WebTestBase {
   }
 
   /**
-   * Generates forum topics to test the display of an active forum block.
+   * Generates forum topics.
    *
    * @param array $forum
    *   The forum array (a row from taxonomy_term_data table).
@@ -619,24 +599,4 @@ class ForumTest extends WebTestBase {
       $this->nids[] = $node->nid;
     }
   }
-
-  /**
-   * Views forum topics to test the display of an active forum block.
-   *
-   * @todo The logic here is completely incorrect, since the active forum topics
-   *   block is determined by comments on the node, not by views.
-   * @todo DIE
-   *
-   * @param $nids
-   *   An array of forum node IDs.
-   */
-  private function viewForumTopics($nids) {
-    for ($i = 0; $i < 2; $i++) {
-      foreach ($nids as $nid) {
-        $this->drupalGet('node/' . $nid);
-        $this->drupalGet('node/' . $nid);
-        $this->drupalGet('node/' . $nid);
-      }
-    }
-  }
 }