diff --git a/core/modules/comment/tests/src/Functional/CommentBlockContentTest.php b/core/modules/comment/tests/src/Functional/CommentBlockContentTest.php
index d9efb6dbe5..f178ac30f0 100644
--- a/core/modules/comment/tests/src/Functional/CommentBlockContentTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentBlockContentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
@@ -8,16 +8,13 @@
 use Drupal\Core\Url;
 use Drupal\comment\Entity\CommentType;
 use Drupal\user\RoleInterface;
-use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests use of comment field on entity-type without a canonical path.
  *
  * @group comment
  */
-class CommentBlockContentTest extends BrowserTestBase {
-
-  use CommentTestTrait;
+class CommentBlockContentTest extends CommentTestBase {
 
   /**
    * Modules to install.
@@ -102,8 +99,8 @@ public function testAnonymousBlockContentCommenting() {
     $edit['comment_body[0][value]'] = 'Noni the pony is skinny and bony';
     $edit['subject[0][value]'] = 'Oh no, why does it go?';
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertResponse(200);
-    $this->assertUrl(Url::fromRoute('user.login'));
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->addressEquals(Url::fromRoute('user.login'));
   }
 
 }