diff --git a/core/modules/language/src/Tests/LanguageTourTest.php b/core/modules/language/src/Tests/LanguageTourTest.php
index 7778367..06e449f 100644
--- a/core/modules/language/src/Tests/LanguageTourTest.php
+++ b/core/modules/language/src/Tests/LanguageTourTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\language\Tests;
 
-use Drupal\tour\Tests\TourTestBase;
+use Drupal\Tests\tour\Functional\TourTestBase;
 
 /**
  * Tests tour functionality.
diff --git a/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php b/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php
index 5c642f2..1c16ca4 100644
--- a/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php
+++ b/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\locale\Tests;
 
-use Drupal\tour\Tests\TourTestBase;
+use Drupal\Tests\tour\Functional\TourTestBase;
 
 /**
  * Tests the Translate Interface tour.
diff --git a/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php b/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php
index c7048fb..087cf6f 100644
--- a/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php
+++ b/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\tour\Functional;
 
 use Drupal\Core\Url;
-use Drupal\system\Tests\Cache\PageCacheTagsTestBase;
+use Drupal\Tests\system\Functional\Cache\PageCacheTagsTestBase;
 use Drupal\tour\Entity\Tour;
 use Drupal\user\Entity\Role;
 use Drupal\user\RoleInterface;
diff --git a/core/modules/tour/src/Tests/TourHelpPageTest.php b/core/modules/tour/tests/src/Functional/TourHelpPageTest.php
similarity index 96%
rename from core/modules/tour/src/Tests/TourHelpPageTest.php
rename to core/modules/tour/tests/src/Functional/TourHelpPageTest.php
index 8a41eb9..c6ab670 100644
--- a/core/modules/tour/src/Tests/TourHelpPageTest.php
+++ b/core/modules/tour/tests/src/Functional/TourHelpPageTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\tour\Tests;
+namespace Drupal\Tests\tour\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Verifies help page display of tours.
  *
  * @group help
  */
-class TourHelpPageTest extends WebTestBase {
+class TourHelpPageTest extends BrowserTestBase {
 
   /**
    * Modules to enable, including some providing tours.
diff --git a/core/modules/tour/src/Tests/TourTest.php b/core/modules/tour/tests/src/Functional/TourTest.php
similarity index 99%
rename from core/modules/tour/src/Tests/TourTest.php
rename to core/modules/tour/tests/src/Functional/TourTest.php
index 78304c6..36a5c77 100644
--- a/core/modules/tour/src/Tests/TourTest.php
+++ b/core/modules/tour/tests/src/Functional/TourTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\tour\Tests;
+namespace Drupal\Tests\tour\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\tour\Entity\Tour;
diff --git a/core/modules/tour/src/Tests/TourTestBase.php b/core/modules/tour/tests/src/Functional/TourTestBase.php
similarity index 94%
rename from core/modules/tour/src/Tests/TourTestBase.php
rename to core/modules/tour/tests/src/Functional/TourTestBase.php
index 8383c99..35cbdcb 100644
--- a/core/modules/tour/src/Tests/TourTestBase.php
+++ b/core/modules/tour/tests/src/Functional/TourTestBase.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\tour\Tests;
+namespace Drupal\Tests\tour\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Base class for testing Tour functionality.
  */
-abstract class TourTestBase extends WebTestBase {
+abstract class TourTestBase extends BrowserTestBase {
 
   /**
    * Assert function to determine if tips rendered to the page
diff --git a/core/modules/tour/src/Tests/TourTestBasic.php b/core/modules/tour/tests/src/Functional/TourTestBasic.php
similarity index 97%
rename from core/modules/tour/src/Tests/TourTestBasic.php
rename to core/modules/tour/tests/src/Functional/TourTestBasic.php
index e79eb2b..ec92987 100644
--- a/core/modules/tour/src/Tests/TourTestBasic.php
+++ b/core/modules/tour/tests/src/Functional/TourTestBasic.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\tour\Tests;
+namespace Drupal\Tests\tour\Functional;
 
 /**
  * Simple tour tips test base.
diff --git a/core/modules/views_ui/src/Tests/ViewsUITourTest.php b/core/modules/views_ui/src/Tests/ViewsUITourTest.php
index ccc0f29..6655b87 100644
--- a/core/modules/views_ui/src/Tests/ViewsUITourTest.php
+++ b/core/modules/views_ui/src/Tests/ViewsUITourTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\views_ui\Tests;
 
-use Drupal\tour\Tests\TourTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\tour\Functional\TourTestBase;
 
 /**
  * Tests the Views UI tour.