diff --git a/core/modules/contact/src/Tests/Views/ContactFieldsTest.php b/core/modules/contact/tests/src/Functional/Views/ContactFieldsTest.php
similarity index 88%
rename from core/modules/contact/src/Tests/Views/ContactFieldsTest.php
rename to core/modules/contact/tests/src/Functional/Views/ContactFieldsTest.php
index fafe451be5..c66b5ad5d4 100644
--- a/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
+++ b/core/modules/contact/tests/src/Functional/Views/ContactFieldsTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\contact\Tests\Views;
+namespace Drupal\Tests\contact\Functional\Views;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\views\Tests\ViewTestBase;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\contact\Entity\ContactForm;
 
@@ -28,8 +28,8 @@ class ContactFieldsTest extends ViewTestBase {
    */
   protected $fieldStorage;
 
-  protected function setUp() {
-    parent::setUp();
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
 
     $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => strtolower($this->randomMachineName()),
diff --git a/core/modules/contact/src/Tests/Views/ContactLinkTest.php b/core/modules/contact/tests/src/Functional/Views/ContactLinkTest.php
similarity index 94%
rename from core/modules/contact/src/Tests/Views/ContactLinkTest.php
rename to core/modules/contact/tests/src/Functional/Views/ContactLinkTest.php
index f6b6013b43..c3b68f067a 100644
--- a/core/modules/contact/src/Tests/Views/ContactLinkTest.php
+++ b/core/modules/contact/tests/src/Functional/Views/ContactLinkTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\contact\Tests\Views;
+namespace Drupal\Tests\contact\Functional\Views;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\views\Tests\ViewTestBase;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\user\Entity\User;
 
@@ -39,8 +39,8 @@ class ContactLinkTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
-    parent::setUp();
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
 
     ViewTestData::createTestViews(get_class($this), ['contact_test_views']);