diff --git a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php b/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
index 53c21f906c..9746a22a51 100644
--- a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
+++ b/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\tracker\Tests\Views;
 
+@trigger_error(__NAMESPACE__ . '\TrackerTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\tracker\Functional\Views\TrackerTestBase', E_USER_DEPRECATED);
+
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\views\Tests\ViewTestBase;
@@ -10,6 +12,9 @@
 
 /**
  * Base class for all tracker tests.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\tracker\Functional\Views\TrackerTestBase instead.
  */
 abstract class TrackerTestBase extends ViewTestBase {
 
diff --git a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php b/core/modules/tracker/tests/src/Functional/Views/TrackerTestBase.php
similarity index 89%
copy from core/modules/tracker/src/Tests/Views/TrackerTestBase.php
copy to core/modules/tracker/tests/src/Functional/Views/TrackerTestBase.php
index 53c21f906c..d70684378c 100644
--- a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
+++ b/core/modules/tracker/tests/src/Functional/Views/TrackerTestBase.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\tracker\Tests\Views;
+namespace Drupal\Tests\tracker\Functional\Views;
 
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\views\Tests\ViewTestBase;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\comment\Entity\Comment;
 
@@ -36,8 +36,8 @@
    */
   protected $comment;
 
-  protected function setUp() {
-    parent::setUp();
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
 
     ViewTestData::createTestViews(get_class($this), ['tracker_test_views']);
 
diff --git a/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php b/core/modules/tracker/tests/src/Functional/Views/TrackerUserUidTest.php
similarity index 97%
rename from core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php
rename to core/modules/tracker/tests/src/Functional/Views/TrackerUserUidTest.php
index 54732a02e8..7bd675b2ed 100644
--- a/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php
+++ b/core/modules/tracker/tests/src/Functional/Views/TrackerUserUidTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\tracker\Tests\Views;
+namespace Drupal\Tests\tracker\Functional\Views;
 
 use Drupal\views\Views;