diff --git a/core/modules/comment/src/Tests/Views/CommentAdminTest.php b/core/modules/comment/tests/src/Functional/Views/CommentAdminTest.php
similarity index 97%
rename from core/modules/comment/src/Tests/Views/CommentAdminTest.php
rename to core/modules/comment/tests/src/Functional/Views/CommentAdminTest.php
index c834bca..0457ce7 100644
--- a/core/modules/comment/src/Tests/Views/CommentAdminTest.php
+++ b/core/modules/comment/tests/src/Functional/Views/CommentAdminTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\comment\Tests\Views;
+namespace Drupal\Tests\comment\Functional\Views;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\comment\Entity\Comment;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\Component\Render\FormattableMarkup;
-use Drupal\comment\Tests\CommentTestBase as CommentWebTestBase;
+use Drupal\Tests\comment\Functional\CommentTestBase as CommentBrowserTestBase;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\user\RoleInterface;
@@ -18,13 +18,13 @@
  *
  * @group comment
  */
-class CommentAdminTest extends CommentWebTestBase {
+class CommentAdminTest extends CommentBrowserTestBase {
 
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
-    parent::setUp();
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
     \Drupal::service('module_installer')->install(['views']);
     $view = Views::getView('comment');
     $view->storage->enable()->save();
diff --git a/core/modules/comment/src/Tests/Views/CommentEditTest.php b/core/modules/comment/tests/src/Functional/Views/CommentEditTest.php
similarity index 75%
rename from core/modules/comment/src/Tests/Views/CommentEditTest.php
rename to core/modules/comment/tests/src/Functional/Views/CommentEditTest.php
index 2a11ef9..fb5f736 100644
--- a/core/modules/comment/src/Tests/Views/CommentEditTest.php
+++ b/core/modules/comment/tests/src/Functional/Views/CommentEditTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\comment\Tests\Views;
+namespace Drupal\Tests\comment\Functional\Views;
 
-use Drupal\comment\Tests\CommentTestBase as CommentWebTestBase;
+use Drupal\Tests\comment\Functional\CommentTestBase as CommentBrowserTestBase;
 
 /**
  * Tests comment edit functionality.
  *
  * @group comment
  */
-class CommentEditTest extends CommentWebTestBase {
+class CommentEditTest extends CommentBrowserTestBase {
 
   /**
    * {@inheritdoc}
@@ -25,7 +25,7 @@ public function testCommentEdit() {
     $node_comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $this->drupalGet('admin/content/comment');
     $this->assertText($this->adminUser->label());
-    $this->drupalGet($node_comment->toUrl('edit-form')->toString());
+    $this->drupalGet($node_comment->toUrl('edit-form'));
     $edit = [
       'comment_body[0][value]' => $this->randomMachineName(),
     ];
diff --git a/core/modules/comment/src/Tests/Views/WizardTest.php b/core/modules/comment/tests/src/Functional/Views/WizardTest.php
similarity index 92%
rename from core/modules/comment/src/Tests/Views/WizardTest.php
rename to core/modules/comment/tests/src/Functional/Views/WizardTest.php
index a7f14c8..62fada9 100644
--- a/core/modules/comment/src/Tests/Views/WizardTest.php
+++ b/core/modules/comment/tests/src/Functional/Views/WizardTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\comment\Tests\Views;
+namespace Drupal\Tests\comment\Functional\Views;
 
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\views\Views;
-use Drupal\views\Tests\Wizard\WizardTestBase;
+use Drupal\Tests\views\Functional\Wizard\WizardTestBase;
 
 /**
  * Tests the comment module integration into the wizard.
@@ -27,8 +27,8 @@ class WizardTest extends WizardTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
-    parent::setUp();
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
     $this->drupalCreateContentType(['type' => 'page', 'name' => t('Basic page')]);
     // Add comment field to page node type.
     $this->addDefaultCommentField('node', 'page');
@@ -63,7 +63,7 @@ public function testCommentWizard() {
     foreach ($fields as $field) {
       $items = $this->getAllOptions($field);
       foreach ($items as $item) {
-        $options[] = $item->attributes()->value;
+        $options[] = $item->getValue();
       }
     }
     $expected_options = ['entity:comment', 'fields'];