diff --git a/core/modules/tracker/src/Tests/TrackerTest.php b/core/modules/tracker/tests/src/Functional/TrackerTest.php
similarity index 99%
rename from core/modules/tracker/src/Tests/TrackerTest.php
rename to core/modules/tracker/tests/src/Functional/TrackerTest.php
index fa95299..6f8bed2 100644
--- a/core/modules/tracker/src/Tests/TrackerTest.php
+++ b/core/modules/tracker/tests/src/Functional/TrackerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\tracker\Tests;
+namespace Drupal\Tests\tracker\Functional;
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Tests\CommentTestTrait;
@@ -9,15 +9,15 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\Node;
-use Drupal\simpletest\WebTestBase;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Create and delete nodes and check for their display in the tracker listings.
  *
  * @group tracker
  */
-class TrackerTest extends WebTestBase {
+class TrackerTest extends BrowserTestBase {
 
   use CommentTestTrait;
   use AssertPageCacheContextsAndTagsTrait;
@@ -208,6 +208,8 @@ public function testTrackerUser() {
 
     // Test escaping of title on user's tracker tab.
     \Drupal::service('module_installer')->install(['user_hooks_test']);
+    $this->resetAll();
+    $this->rebuildContainer();
     Cache::invalidateTags(['rendered']);
     \Drupal::state()->set('user_hooks_test_user_format_name_alter', TRUE);
     $this->drupalGet('user/' . $this->user->id() . '/activity');