diff --git a/core/modules/block/lib/Drupal/block/Tests/TourBlockTest.php b/core/modules/block/lib/Drupal/block/Tests/TourBlockTest.php
index 84b7af9..fbe4a83 100644
--- a/core/modules/block/lib/Drupal/block/Tests/TourBlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/TourBlockTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\block\Tests\TourCustomBlockTest.
+ * Contains \Drupal\block\Tests\TourBlockTest.
  */
 
 namespace Drupal\block\Tests;
@@ -14,41 +14,52 @@
  */
 class TourBlockTest extends TourTestBasic {
 
+  /**
+   * {@inheritdoc}
+   */
   protected $tips = array(
     '/admin/structure/block' => array(),
-    //'/admin/structure/block/seven' => array(),
   );
 
+  /**
+   * {@inheritdoc}
+   */
   public static $modules = array('help', 'tour', 'block', 'custom_block');
 
-  function __construct($test_id = NULL) {
-    parent::__construct($test_id);
+  /**
+   * {@inheritdoc}
+   */
+  public static function getInfo() {
+    return array(
+      'name' => 'Block tour',
+      'description' => 'Tests the Administer Block tour.',
+      'group' => 'Block',
+    );
+  }
 
+  /**
+   * {@inheritdoc}
+   */
+  function setUp() {
     $this->permissions[] = 'administer blocks';
     $this->permissions[] = 'view the administration theme';
     $this->permissions[] = 'access administration pages';
-  }
-  function setUp() {
     parent::setUp();
+
     // Enable some test blocks.
-    $this->testBlocks = array(
+    $blocks = array(
       array(
         'plugin_id' => 'system_help_block',
-        'settings' => array('region' => 'help', 'machine_name' => 'help'),
+        'settings' => array(
+          'region' => 'help',
+          'machine_name' => 'help',
+        ),
         'weight' => '0',
       ),
     );
-    foreach ($this->testBlocks as $values) {
+    foreach ($blocks as $values) {
       $this->drupalPlaceBlock($values['plugin_id'], $values['settings']);
     }
   }
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Block tour tests',
-      'description' => 'Tests the Administer Block tour.',
-      'group' => 'Tour',
-    );
-  }
-
 }