diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php
index 9e795be..cb42f00 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php
@@ -17,7 +17,10 @@ class EntityFilteringThemeTest extends WebTestBase {
   /**
    * Use the standard profile.
    *
-   * @var array
+   * We test entity theming with the default node, user, comment, and taxonomy
+   * configurations at several paths in the standard profile.
+   *
+   * @var string
    */
   protected $profile = 'standard';
 
@@ -94,7 +97,7 @@ function setUp() {
     ));
     taxonomy_term_save($this->term);
 
-    // Create a test node.
+    // Create a test node tagged with the test term.
     $this->node = $this->drupalCreateNode(array(
       'title' => $this->xss_label,
       'type' => 'article',
@@ -102,10 +105,10 @@ function setUp() {
       'field_tags' => array(LANGUAGE_NOT_SPECIFIED => array(array('tid' => $this->term->tid))),
     ));
 
-    // Create a test comment.
+    // Create a test comment on the test node.
     $this->comment = entity_create('comment', array(
       'nid' => $this->node->nid,
-      'node_type' => 'article',
+      'node_type' => $this->node->type,
       'status' => COMMENT_PUBLISHED,
       'subject' => $this->xss_label,
       'comment_body' => array(LANGUAGE_NOT_SPECIFIED => array($this->randomName())),