diff --git a/core/modules/block/tests/src/Functional/BlockLayoutTourTest.php b/core/modules/tour/tests/src/Functional/Block/BlockLayoutTourTest.php
similarity index 93%
rename from core/modules/block/tests/src/Functional/BlockLayoutTourTest.php
rename to core/modules/tour/tests/src/Functional/Block/BlockLayoutTourTest.php
index 99cf79805f4b0a1a417a0f303ae6b2b0c60732b8..50bf112786a17dcd9caf6e27ea4337e6593f0bd5 100644
--- a/core/modules/block/tests/src/Functional/BlockLayoutTourTest.php
+++ b/core/modules/tour/tests/src/Functional/Block/BlockLayoutTourTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\block\Functional;
+namespace Drupal\Tests\tour\Functional\Block;
 
 use Drupal\Tests\tour\Functional\TourTestBase;
 
 /**
  * Tests the Block Layout tour.
  *
- * @group block
+ * @group tour
  */
 class BlockLayoutTourTest extends TourTestBase {
 
diff --git a/core/modules/jsonapi/tests/src/Functional/TourTest.php b/core/modules/tour/tests/src/Functional/Jsonapi/TourTest.php
similarity index 95%
rename from core/modules/jsonapi/tests/src/Functional/TourTest.php
rename to core/modules/tour/tests/src/Functional/Jsonapi/TourTest.php
index 138616099022124b765a62d33655a7e20389740a..3c0f37811a78fb953c35fa04a2b9369442879505 100644
--- a/core/modules/jsonapi/tests/src/Functional/TourTest.php
+++ b/core/modules/tour/tests/src/Functional/Jsonapi/TourTest.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace Drupal\Tests\jsonapi\Functional;
+namespace Drupal\Tests\tour\Functional\Jsonapi;
 
 use Drupal\Core\Url;
+use Drupal\Tests\jsonapi\Functional\ConfigEntityResourceTestBase;
 use Drupal\tour\Entity\Tour;
 
 /**
  * JSON:API integration test for the "Tour" config entity type.
  *
- * @group jsonapi
+ * @group tour
  */
 class TourTest extends ConfigEntityResourceTestBase {
 
diff --git a/core/modules/language/tests/src/Functional/LanguageTourTest.php b/core/modules/tour/tests/src/Functional/Language/LanguageTourTest.php
similarity index 96%
rename from core/modules/language/tests/src/Functional/LanguageTourTest.php
rename to core/modules/tour/tests/src/Functional/Language/LanguageTourTest.php
index 002f6fdcbacdc7b3b65247161a685d06ea5827b0..b18d586da9f97d0393860621e613c7226458d178 100644
--- a/core/modules/language/tests/src/Functional/LanguageTourTest.php
+++ b/core/modules/tour/tests/src/Functional/Language/LanguageTourTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\language\Functional;
+namespace Drupal\Tests\tour\Functional\Language;
 
 use Drupal\Tests\tour\Functional\TourTestBase;
 
diff --git a/core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php b/core/modules/tour/tests/src/Functional/Locale/LocaleTranslateStringTourTest.php
similarity index 95%
rename from core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php
rename to core/modules/tour/tests/src/Functional/Locale/LocaleTranslateStringTourTest.php
index c4be9d779bc69eb8302f4d891b852e54a0c15e28..548a5ab869ebb6449b3cdbc0b86da302d54271ab 100644
--- a/core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php
+++ b/core/modules/tour/tests/src/Functional/Locale/LocaleTranslateStringTourTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\locale\Functional;
+namespace Drupal\Tests\tour\Functional\Locale;
 
 use Drupal\Tests\tour\Functional\TourTestBase;
 
 /**
  * Tests the Translate Interface tour.
  *
- * @group locale
+ * @group tour
  */
 class LocaleTranslateStringTourTest extends TourTestBase {
 
diff --git a/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php b/core/modules/tour/tests/src/Functional/ViewsUi/ViewsUITourTest.php
similarity index 97%
rename from core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php
rename to core/modules/tour/tests/src/Functional/ViewsUi/ViewsUITourTest.php
index eea297a2b71ec86aa1aa74f438c1d505a931d732..1951a00877fb04b345389a3e2a137f5e0859f0af 100644
--- a/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php
+++ b/core/modules/tour/tests/src/Functional/ViewsUi/ViewsUITourTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\views_ui\Functional;
+namespace Drupal\Tests\tour\Functional\ViewsUi;
 
 use Drupal\Tests\tour\Functional\TourTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -8,7 +8,7 @@
 /**
  * Tests the Views UI tour.
  *
- * @group views_ui
+ * @group tour
  */
 class ViewsUITourTest extends TourTestBase {