diff --git a/browsertest-convert.php b/browsertest-convert.php
new file mode 100644
index 0000000..8a448bf
--- /dev/null
+++ b/browsertest-convert.php
@@ -0,0 +1,132 @@
+<?php
+
+$modules = [
+'action',
+'content_translation',
+'language',
+'serialization',
+'aggregator',
+'contextual',
+'link',
+'shortcut',
+'automated_cron',
+'datetime',
+'locale',
+'simpletest',
+'ban',
+'datetime_range',
+'menu_link_content',
+'statistics',
+'basic_auth',
+'dblog',
+'menu_ui',
+'syslog',
+'big_pipe',
+'dynamic_page_cache',
+'migrate',
+'system',
+'block',
+'editor',
+'migrate_drupal',
+'taxonomy',
+'block_content',
+'entity_reference',
+'migrate_drupal_ui',
+'telephone',
+'block_place',
+'field',
+'node',
+'text',
+'book',
+'field_ui',
+'options ',
+'toolbar',
+'breakpoint',
+'file',
+'outside_in',
+'tour',
+'ckeditor',
+'filter',
+'page_cache',
+'tracker',
+'color',
+'forum',
+'path',
+'update',
+'comment',
+'hal',
+'quickedit',
+'user',
+'config',
+'help',
+'rdf',
+'views',
+'config_translation',
+'history',
+'responsive_image',
+'views_ui',
+'contact',
+'image',
+'rest',
+'content_moderation',
+'inline_form_errors',
+'search',
+];
+
+$excluded_tests = [
+  // Exclude some manual ones.
+  'FilterFormatAccessTest',
+  'AddFeedTest',
+  'AggregatorAdminTest',
+  'AggregatorCronTest',
+  'AggregatorRenderingTest',
+  // Exclude update tests, they are their own beast.
+  'Update',
+  // Exclude views, as their test base needs adaption.
+  'views',
+  'views_ui',
+];
+
+function isTestExcluded($test_name, array $excluded_tests) {
+  foreach ($excluded_tests as $excluded_test) {
+    if (strpos($test_name, $excluded_test) !== FALSE) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+foreach ($modules as $module_name) {
+  $simpletest_dir = "core/modules/$module_name/src/Tests";
+  $browsertest_dir = "core/modules/$module_name/tests/src/Functional";
+
+  if (!file_exists($simpletest_dir)) {
+    continue;
+    print "SimpleTest directory $simpletest_dir does not exist.\n";
+  }
+
+  $test_files = glob("$simpletest_dir/*.php");
+
+  if (!file_exists($browsertest_dir)) {
+    mkdir($browsertest_dir, 0777, TRUE);
+  }
+
+  foreach ($test_files as $simpletest_file_path) {
+    if (isTestExcluded($simpletest_file_path, $excluded_tests)) {
+      continue;
+    }
+
+    $file_name = basename($simpletest_file_path);
+    $file_content = file_get_contents($simpletest_file_path);
+
+    $file_content = str_replace("namespace Drupal\\$module_name\\Tests;", "namespace Drupal\\Tests\\$module_name\\Functional;", $file_content);
+    $file_content = str_replace("use Drupal\\simpletest\\WebTestBase;", "use Drupal\\Tests\\BrowserTestBase;", $file_content);
+    $file_content = str_replace(" extends WebTestBase {", " extends BrowserTestBase {", $file_content);
+
+    file_put_contents("$browsertest_dir/$file_name", $file_content);
+    unlink($simpletest_file_path);
+  }
+
+
+  print "Tests converted for module $module_name.\n";
+}
diff --git a/core/modules/action/src/Tests/ActionListTest.php b/core/modules/action/tests/src/Functional/ActionListTest.php
similarity index 87%
rename from core/modules/action/src/Tests/ActionListTest.php
rename to core/modules/action/tests/src/Functional/ActionListTest.php
index f533cdf..2510e86 100644
--- a/core/modules/action/src/Tests/ActionListTest.php
+++ b/core/modules/action/tests/src/Functional/ActionListTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\action\Tests;
+namespace Drupal\Tests\action\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test behaviors when visiting the action listing page.
  *
  * @group action
  */
-class ActionListTest extends WebTestBase {
+class ActionListTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
similarity index 98%
rename from core/modules/aggregator/src/Tests/AggregatorTestBase.php
rename to core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
index 15be144..a6c9c32 100644
--- a/core/modules/aggregator/src/Tests/AggregatorTestBase.php
+++ b/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\Component\Utility\Html;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\aggregator\FeedInterface;
 
 /**
  * Defines a base class for testing the Aggregator module.
  */
-abstract class AggregatorTestBase extends WebTestBase {
+abstract class AggregatorTestBase extends BrowserTestBase {
 
   /**
    * A user with permission to administer feeds and create content.
diff --git a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php b/core/modules/aggregator/tests/src/Functional/DeleteFeedItemTest.php
similarity index 96%
rename from core/modules/aggregator/src/Tests/DeleteFeedItemTest.php
rename to core/modules/aggregator/tests/src/Functional/DeleteFeedItemTest.php
index 0261ed5..95202b8 100644
--- a/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php
+++ b/core/modules/aggregator/tests/src/Functional/DeleteFeedItemTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 /**
  * Delete feed items from a feed.
diff --git a/core/modules/aggregator/src/Tests/DeleteFeedTest.php b/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
similarity index 97%
rename from core/modules/aggregator/src/Tests/DeleteFeedTest.php
rename to core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
index 4cde81a..5bf5bd3 100644
--- a/core/modules/aggregator/src/Tests/DeleteFeedTest.php
+++ b/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 /**
  * Delete feed test.
diff --git a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php b/core/modules/aggregator/tests/src/Functional/FeedAdminDisplayTest.php
similarity index 98%
rename from core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php
rename to core/modules/aggregator/tests/src/Functional/FeedAdminDisplayTest.php
index 0324e3b..9eb5cac 100644
--- a/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php
+++ b/core/modules/aggregator/tests/src/Functional/FeedAdminDisplayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 /**
  * Tests the display of a feed on the Aggregator list page.
diff --git a/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php b/core/modules/aggregator/tests/src/Functional/FeedCacheTagsTest.php
similarity index 95%
rename from core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
rename to core/modules/aggregator/tests/src/Functional/FeedCacheTagsTest.php
index 2b85c19..1a30720 100644
--- a/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
+++ b/core/modules/aggregator/tests/src/Functional/FeedCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
diff --git a/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php b/core/modules/aggregator/tests/src/Functional/FeedFetcherPluginTest.php
similarity index 95%
rename from core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php
rename to core/modules/aggregator/tests/src/Functional/FeedFetcherPluginTest.php
index 4aac851..1a03186 100644
--- a/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php
+++ b/core/modules/aggregator/tests/src/Functional/FeedFetcherPluginTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 /**
  * Tests the fetcher plugins functionality and discoverability.
diff --git a/core/modules/aggregator/src/Tests/FeedLanguageTest.php b/core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php
similarity index 98%
rename from core/modules/aggregator/src/Tests/FeedLanguageTest.php
rename to core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php
index af8335e..81f8b42 100644
--- a/core/modules/aggregator/src/Tests/FeedLanguageTest.php
+++ b/core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 
diff --git a/core/modules/aggregator/src/Tests/FeedParserTest.php b/core/modules/aggregator/tests/src/Functional/FeedParserTest.php
similarity index 99%
rename from core/modules/aggregator/src/Tests/FeedParserTest.php
rename to core/modules/aggregator/tests/src/Functional/FeedParserTest.php
index 6c4a04d..00c7b70 100644
--- a/core/modules/aggregator/src/Tests/FeedParserTest.php
+++ b/core/modules/aggregator/tests/src/Functional/FeedParserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\Core\Url;
 use Drupal\aggregator\Entity\Feed;
diff --git a/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php b/core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php
similarity index 97%
rename from core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php
rename to core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php
index 8a7ade0..5527d95 100644
--- a/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php
+++ b/core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\aggregator\Entity\Item;
diff --git a/core/modules/aggregator/src/Tests/ImportOpmlTest.php b/core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php
similarity index 99%
rename from core/modules/aggregator/src/Tests/ImportOpmlTest.php
rename to core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php
index 1f1e90d..8994e3f 100644
--- a/core/modules/aggregator/src/Tests/ImportOpmlTest.php
+++ b/core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 /**
  * Tests OPML import.
diff --git a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php b/core/modules/aggregator/tests/src/Functional/ItemCacheTagsTest.php
similarity index 97%
rename from core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
rename to core/modules/aggregator/tests/src/Functional/ItemCacheTagsTest.php
index 1986cea..46b076c 100644
--- a/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
+++ b/core/modules/aggregator/tests/src/Functional/ItemCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\aggregator\Entity\Item;
diff --git a/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php b/core/modules/basic_auth/tests/src/Functional/BasicAuthTestTrait.php
similarity index 98%
rename from core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php
rename to core/modules/basic_auth/tests/src/Functional/BasicAuthTestTrait.php
index b5766fb..645a483 100644
--- a/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php
+++ b/core/modules/basic_auth/tests/src/Functional/BasicAuthTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\basic_auth\Tests;
+namespace Drupal\Tests\basic_auth\Functional;
 
 /**
  * Provides common functionality for Basic Authentication test classes.
diff --git a/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php b/core/modules/big_pipe/tests/src/Functional/BigPipePlaceholderTestCases.php
similarity index 99%
rename from core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
rename to core/modules/big_pipe/tests/src/Functional/BigPipePlaceholderTestCases.php
index 102b718..48789e9 100644
--- a/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
+++ b/core/modules/big_pipe/tests/src/Functional/BigPipePlaceholderTestCases.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\big_pipe\Unit\Render\Placeholder\BigPipePlaceholderTestCases.
  */
 
-namespace Drupal\big_pipe\Tests;
+namespace Drupal\Tests\big_pipe\Functional;
 
 use Drupal\big_pipe\Render\BigPipeMarkup;
 use Drupal\Core\Session\AccountInterface;
diff --git a/core/modules/big_pipe/src/Tests/BigPipeTest.php b/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
similarity index 99%
rename from core/modules/big_pipe/src/Tests/BigPipeTest.php
rename to core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
index a3f773e..1708f63 100644
--- a/core/modules/big_pipe/src/Tests/BigPipeTest.php
+++ b/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\big_pipe\Tests;
+namespace Drupal\Tests\big_pipe\Functional;
 
 use Drupal\big_pipe\Render\Placeholder\BigPipeStrategy;
 use Drupal\big_pipe\Render\BigPipe;
@@ -8,7 +8,7 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Logger\RfcLogLevel;
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests BigPipe's no-JS detection & response delivery (with and without JS).
@@ -21,7 +21,7 @@
  *
  * @group big_pipe
  */
-class BigPipeTest extends WebTestBase {
+class BigPipeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/block/src/Tests/BlockAdminThemeTest.php b/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
similarity index 94%
rename from core/modules/block/src/Tests/BlockAdminThemeTest.php
rename to core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
index ab444d5..6c4ffb6 100644
--- a/core/modules/block/src/Tests/BlockAdminThemeTest.php
+++ b/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the block system with admin themes.
  *
  * @group block
  */
-class BlockAdminThemeTest extends WebTestBase {
+class BlockAdminThemeTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockCacheTest.php b/core/modules/block/tests/src/Functional/BlockCacheTest.php
similarity index 98%
rename from core/modules/block/src/Tests/BlockCacheTest.php
rename to core/modules/block/tests/src/Functional/BlockCacheTest.php
index 8988580..9285c64 100644
--- a/core/modules/block/src/Tests/BlockCacheTest.php
+++ b/core/modules/block/tests/src/Functional/BlockCacheTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests block caching.
  *
  * @group block
  */
-class BlockCacheTest extends WebTestBase {
+class BlockCacheTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockFormInBlockTest.php b/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
similarity index 93%
rename from core/modules/block/src/Tests/BlockFormInBlockTest.php
rename to core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
index 20d24b2..9ddcd34 100644
--- a/core/modules/block/src/Tests/BlockFormInBlockTest.php
+++ b/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests form in block caching.
  *
  * @group block
  */
-class BlockFormInBlockTest extends WebTestBase {
+class BlockFormInBlockTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockHiddenRegionTest.php b/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
similarity index 93%
rename from core/modules/block/src/Tests/BlockHiddenRegionTest.php
rename to core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
index b7d44ad..e2965dc 100644
--- a/core/modules/block/src/Tests/BlockHiddenRegionTest.php
+++ b/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that a newly installed theme does not inherit blocks to its hidden
@@ -10,7 +10,7 @@
  *
  * @group block
  */
-class BlockHiddenRegionTest extends WebTestBase {
+class BlockHiddenRegionTest extends BrowserTestBase {
 
   /**
    * An administrative user to configure the test environment.
diff --git a/core/modules/block/src/Tests/BlockHookOperationTest.php b/core/modules/block/tests/src/Functional/BlockHookOperationTest.php
similarity index 90%
rename from core/modules/block/src/Tests/BlockHookOperationTest.php
rename to core/modules/block/tests/src/Functional/BlockHookOperationTest.php
index 91ea843..9cb2272 100644
--- a/core/modules/block/src/Tests/BlockHookOperationTest.php
+++ b/core/modules/block/tests/src/Functional/BlockHookOperationTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for Block module regarding hook_entity_operations_alter().
  *
  * @group block
  */
-class BlockHookOperationTest extends WebTestBase {
+class BlockHookOperationTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockHtmlTest.php b/core/modules/block/tests/src/Functional/BlockHtmlTest.php
similarity index 92%
rename from core/modules/block/src/Tests/BlockHtmlTest.php
rename to core/modules/block/tests/src/Functional/BlockHtmlTest.php
index baf5d4b..89bbcf9 100644
--- a/core/modules/block/src/Tests/BlockHtmlTest.php
+++ b/core/modules/block/tests/src/Functional/BlockHtmlTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests block HTML ID validity.
  *
  * @group block
  */
-class BlockHtmlTest extends WebTestBase {
+class BlockHtmlTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockInstallTest.php b/core/modules/block/tests/src/Functional/BlockInstallTest.php
similarity index 87%
rename from core/modules/block/src/Tests/BlockInstallTest.php
rename to core/modules/block/tests/src/Functional/BlockInstallTest.php
index 55f4b8a..c6fd1eb 100644
--- a/core/modules/block/src/Tests/BlockInstallTest.php
+++ b/core/modules/block/tests/src/Functional/BlockInstallTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests block module's installation.
  *
  * @group block
  */
-class BlockInstallTest extends WebTestBase {
+class BlockInstallTest extends BrowserTestBase {
 
   public function testCacheTagInvalidationUponInstallation() {
     // Warm the page cache.
diff --git a/core/modules/block/src/Tests/BlockInvalidRegionTest.php b/core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php
similarity index 94%
rename from core/modules/block/src/Tests/BlockInvalidRegionTest.php
rename to core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php
index 99ef06d..b0e08b9 100644
--- a/core/modules/block/src/Tests/BlockInvalidRegionTest.php
+++ b/core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\block\Entity\Block;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group block
  */
-class BlockInvalidRegionTest extends WebTestBase {
+class BlockInvalidRegionTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockLanguageCacheTest.php b/core/modules/block/tests/src/Functional/BlockLanguageCacheTest.php
similarity index 93%
rename from core/modules/block/src/Tests/BlockLanguageCacheTest.php
rename to core/modules/block/tests/src/Functional/BlockLanguageCacheTest.php
index fd5871e..fdee8e6 100644
--- a/core/modules/block/src/Tests/BlockLanguageCacheTest.php
+++ b/core/modules/block/tests/src/Functional/BlockLanguageCacheTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests display of menu blocks with multiple languages.
  *
  * @group block
  */
-class BlockLanguageCacheTest extends WebTestBase {
+class BlockLanguageCacheTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockLanguageTest.php b/core/modules/block/tests/src/Functional/BlockLanguageTest.php
similarity index 98%
rename from core/modules/block/src/Tests/BlockLanguageTest.php
rename to core/modules/block/tests/src/Functional/BlockLanguageTest.php
index a2bf249..7e0a0e1 100644
--- a/core/modules/block/src/Tests/BlockLanguageTest.php
+++ b/core/modules/block/tests/src/Functional/BlockLanguageTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\block\Entity\Block;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group block
  */
-class BlockLanguageTest extends WebTestBase {
+class BlockLanguageTest extends BrowserTestBase {
 
   /**
    * An administrative user to configure the test environment.
diff --git a/core/modules/block/src/Tests/BlockRenderOrderTest.php b/core/modules/block/tests/src/Functional/BlockRenderOrderTest.php
similarity index 94%
rename from core/modules/block/src/Tests/BlockRenderOrderTest.php
rename to core/modules/block/tests/src/Functional/BlockRenderOrderTest.php
index faf667e..ae1f657 100644
--- a/core/modules/block/src/Tests/BlockRenderOrderTest.php
+++ b/core/modules/block/tests/src/Functional/BlockRenderOrderTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\Component\Utility\Html;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests blocks are being rendered in order by weight.
  *
  * @group block
  */
-class BlockRenderOrderTest extends WebTestBase {
+class BlockRenderOrderTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockSystemBrandingTest.php b/core/modules/block/tests/src/Functional/BlockSystemBrandingTest.php
similarity index 99%
rename from core/modules/block/src/Tests/BlockSystemBrandingTest.php
rename to core/modules/block/tests/src/Functional/BlockSystemBrandingTest.php
index f3dfa3c..f572a0d 100644
--- a/core/modules/block/src/Tests/BlockSystemBrandingTest.php
+++ b/core/modules/block/tests/src/Functional/BlockSystemBrandingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 /**
  * Tests branding block display.
diff --git a/core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php b/core/modules/block/tests/src/Functional/BlockTemplateSuggestionsTest.php
similarity index 91%
rename from core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php
rename to core/modules/block/tests/src/Functional/BlockTemplateSuggestionsTest.php
index d5ce8e6..ca13c58 100644
--- a/core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php
+++ b/core/modules/block/tests/src/Functional/BlockTemplateSuggestionsTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\block\Entity\Block;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the block_theme_suggestions_block() function.
  *
  * @group block
  */
-class BlockTemplateSuggestionsTest extends WebTestBase {
+class BlockTemplateSuggestionsTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockTest.php b/core/modules/block/tests/src/Functional/BlockTest.php
similarity index 99%
rename from core/modules/block/src/Tests/BlockTest.php
rename to core/modules/block/tests/src/Functional/BlockTest.php
index f5924ca..621d40e 100644
--- a/core/modules/block/src/Tests/BlockTest.php
+++ b/core/modules/block/tests/src/Functional/BlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\block\Entity\Block;
diff --git a/core/modules/block/src/Tests/BlockTestBase.php b/core/modules/block/tests/src/Functional/BlockTestBase.php
similarity index 92%
rename from core/modules/block/src/Tests/BlockTestBase.php
rename to core/modules/block/tests/src/Functional/BlockTestBase.php
index 970de52..110e317 100644
--- a/core/modules/block/src/Tests/BlockTestBase.php
+++ b/core/modules/block/tests/src/Functional/BlockTestBase.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Provides setup and helper methods for block module tests.
  */
-abstract class BlockTestBase extends WebTestBase {
+abstract class BlockTestBase extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockUiTest.php b/core/modules/block/tests/src/Functional/BlockUiTest.php
similarity index 99%
rename from core/modules/block/src/Tests/BlockUiTest.php
rename to core/modules/block/tests/src/Functional/BlockUiTest.php
index f2bcaae..87bc2fd 100644
--- a/core/modules/block/src/Tests/BlockUiTest.php
+++ b/core/modules/block/tests/src/Functional/BlockUiTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\Component\Utility\Html;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that the block configuration UI exists and stores data correctly.
  *
  * @group block
  */
-class BlockUiTest extends WebTestBase {
+class BlockUiTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/BlockXssTest.php b/core/modules/block/tests/src/Functional/BlockXssTest.php
similarity index 97%
rename from core/modules/block/src/Tests/BlockXssTest.php
rename to core/modules/block/tests/src/Functional/BlockXssTest.php
index b37f4cd..e1def68 100644
--- a/core/modules/block/src/Tests/BlockXssTest.php
+++ b/core/modules/block/tests/src/Functional/BlockXssTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Entity\Menu;
 use Drupal\views\Entity\View;
 
@@ -14,7 +14,7 @@
  *
  * @group block
  */
-class BlockXssTest extends WebTestBase {
+class BlockXssTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php b/core/modules/block/tests/src/Functional/NewDefaultThemeBlocksTest.php
similarity index 95%
rename from core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php
rename to core/modules/block/tests/src/Functional/NewDefaultThemeBlocksTest.php
index 9442df5..60d132e 100644
--- a/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php
+++ b/core/modules/block/tests/src/Functional/NewDefaultThemeBlocksTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that the new default theme gets blocks.
  *
  * @group block
  */
-class NewDefaultThemeBlocksTest extends WebTestBase {
+class NewDefaultThemeBlocksTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php b/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php
similarity index 86%
rename from core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
rename to core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php
index 218832d..ac76f02 100644
--- a/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
+++ b/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the block administration page for a non-default theme.
  *
  * @group block
  */
-class NonDefaultBlockAdminTest extends WebTestBase {
+class NonDefaultBlockAdminTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php b/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php
similarity index 98%
rename from core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php
index 7eefdc7..f44a773 100644
--- a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
diff --git a/core/modules/block_content/src/Tests/BlockContentCreationTest.php b/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
similarity index 99%
rename from core/modules/block_content/src/Tests/BlockContentCreationTest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
index e45892c..60af515 100644
--- a/core/modules/block_content/src/Tests/BlockContentCreationTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/block_content/src/Tests/BlockContentListTest.php b/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
similarity index 98%
rename from core/modules/block_content/src/Tests/BlockContentListTest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentListTest.php
index be8ea5e..e65b98d 100644
--- a/core/modules/block_content/src/Tests/BlockContentListTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 /**
  * Tests the listing of custom blocks.
diff --git a/core/modules/block_content/src/Tests/BlockContentListViewsTest.php b/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php
similarity index 98%
rename from core/modules/block_content/src/Tests/BlockContentListViewsTest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php
index de0ff3b..8a54214 100644
--- a/core/modules/block_content/src/Tests/BlockContentListViewsTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 /**
  * Tests the Views-powered listing of custom blocks.
diff --git a/core/modules/block_content/src/Tests/BlockContentPageViewTest.php b/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php
similarity index 94%
rename from core/modules/block_content/src/Tests/BlockContentPageViewTest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php
index 46c19cb..8c55da3 100644
--- a/core/modules/block_content/src/Tests/BlockContentPageViewTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 /**
  * Create a block and test block access by attempting to view the block.
diff --git a/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php b/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
similarity index 98%
rename from core/modules/block_content/src/Tests/BlockContentRevisionsTest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
index 7c4a8f2..33f75ed 100644
--- a/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\user\Entity\User;
diff --git a/core/modules/block_content/src/Tests/BlockContentSaveTest.php b/core/modules/block_content/tests/src/Functional/BlockContentSaveTest.php
similarity index 98%
rename from core/modules/block_content/src/Tests/BlockContentSaveTest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentSaveTest.php
index aabf7b6..a68f423 100644
--- a/core/modules/block_content/src/Tests/BlockContentSaveTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentSaveTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 
diff --git a/core/modules/block_content/src/Tests/BlockContentTestBase.php b/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
similarity index 94%
rename from core/modules/block_content/src/Tests/BlockContentTestBase.php
rename to core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
index 16df855..e5e7736 100644
--- a/core/modules/block_content/src/Tests/BlockContentTestBase.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Sets up block content types.
  */
-abstract class BlockContentTestBase extends WebTestBase {
+abstract class BlockContentTestBase extends BrowserTestBase {
 
   /**
    * Profile to use.
diff --git a/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php b/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php
similarity index 99%
rename from core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php
index 332bf3d..2628079 100644
--- a/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
diff --git a/core/modules/block_content/src/Tests/BlockContentTypeTest.php b/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
similarity index 99%
rename from core/modules/block_content/src/Tests/BlockContentTypeTest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
index 8f6ffe1..cf4bf76 100644
--- a/core/modules/block_content/src/Tests/BlockContentTypeTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Utility\Html;
diff --git a/core/modules/block_content/src/Tests/BlockContentValidationTest.php b/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php
similarity index 96%
rename from core/modules/block_content/src/Tests/BlockContentValidationTest.php
rename to core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php
index a0db394..bfa8408 100644
--- a/core/modules/block_content/src/Tests/BlockContentValidationTest.php
+++ b/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 /**
  * Tests block content validation constraints.
diff --git a/core/modules/block_content/src/Tests/PageEditTest.php b/core/modules/block_content/tests/src/Functional/PageEditTest.php
similarity index 98%
rename from core/modules/block_content/src/Tests/PageEditTest.php
rename to core/modules/block_content/tests/src/Functional/PageEditTest.php
index 4a3fb90..bab2a29 100644
--- a/core/modules/block_content/src/Tests/PageEditTest.php
+++ b/core/modules/block_content/tests/src/Functional/PageEditTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/book/src/Tests/BookBreadcrumbTest.php b/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
similarity index 98%
rename from core/modules/book/src/Tests/BookBreadcrumbTest.php
rename to core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
index 57e1b3d..dde3b22 100644
--- a/core/modules/book/src/Tests/BookBreadcrumbTest.php
+++ b/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\book\Tests;
+namespace Drupal\Tests\book\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Create a book, add pages, and test book interface.
  *
  * @group book
  */
-class BookBreadcrumbTest extends WebTestBase {
+class BookBreadcrumbTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/book/src/Tests/BookTest.php b/core/modules/book/tests/src/Functional/BookTest.php
similarity index 99%
rename from core/modules/book/src/Tests/BookTest.php
rename to core/modules/book/tests/src/Functional/BookTest.php
index 0158992..5746f1e 100644
--- a/core/modules/book/src/Tests/BookTest.php
+++ b/core/modules/book/tests/src/Functional/BookTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\book\Tests;
+namespace Drupal\Tests\book\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @group book
  */
-class BookTest extends WebTestBase {
+class BookTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
similarity index 99%
rename from core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
rename to core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
index d10180d..e101799 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\ckeditor\Tests;
+namespace Drupal\Tests\ckeditor\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\editor\Entity\Editor;
 use Drupal\filter\FilterFormatInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @group ckeditor
  */
-class CKEditorAdminTest extends WebTestBase {
+class CKEditorAdminTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
similarity index 98%
rename from core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
rename to core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
index 6efe647..bd5d7a8 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
+++ b/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\ckeditor\Tests;
+namespace Drupal\Tests\ckeditor\Functional;
 
 use Drupal\editor\Entity\Editor;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group ckeditor
  */
-class CKEditorLoadingTest extends WebTestBase {
+class CKEditorLoadingTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/ckeditor/src/Tests/CKEditorStylesComboAdminTest.php b/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboAdminTest.php
similarity index 95%
rename from core/modules/ckeditor/src/Tests/CKEditorStylesComboAdminTest.php
rename to core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboAdminTest.php
index d70980e..808d20d 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorStylesComboAdminTest.php
+++ b/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboAdminTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\ckeditor\Tests;
+namespace Drupal\Tests\ckeditor\Functional;
 
 use Drupal\editor\Entity\Editor;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group ckeditor
  */
-class CKEditorStylesComboAdminTest extends WebTestBase {
+class CKEditorStylesComboAdminTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php b/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
similarity index 93%
rename from core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php
rename to core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
index 22874b7..e8d0e2d 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php
+++ b/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\ckeditor\Tests;
+namespace Drupal\Tests\ckeditor\Functional;
 
 
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\editor\Entity\Editor;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Component\Serialization\Json;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @group ckeditor
  */
-class CKEditorToolbarButtonTest extends WebTestBase {
+class CKEditorToolbarButtonTest extends BrowserTestBase {
 
   /**
    * Modules to enable for this test.
diff --git a/core/modules/comment/src/Tests/CommentActionsTest.php b/core/modules/comment/tests/src/Functional/CommentActionsTest.php
similarity index 97%
rename from core/modules/comment/src/Tests/CommentActionsTest.php
rename to core/modules/comment/tests/src/Functional/CommentActionsTest.php
index 220be20..4c32426 100644
--- a/core/modules/comment/src/Tests/CommentActionsTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentActionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\Entity\Comment;
 use Drupal\system\Entity\Action;
diff --git a/core/modules/comment/src/Tests/CommentAdminTest.php b/core/modules/comment/tests/src/Functional/CommentAdminTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentAdminTest.php
rename to core/modules/comment/tests/src/Functional/CommentAdminTest.php
index 5ae57cb..b023cc0 100644
--- a/core/modules/comment/src/Tests/CommentAdminTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentAdminTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\user\RoleInterface;
 use Drupal\comment\Entity\Comment;
diff --git a/core/modules/comment/src/Tests/CommentAnonymousTest.php b/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentAnonymousTest.php
rename to core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
index 660d754..103d661 100644
--- a/core/modules/comment/src/Tests/CommentAnonymousTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\user\RoleInterface;
 
diff --git a/core/modules/comment/src/Tests/CommentBlockTest.php b/core/modules/comment/tests/src/Functional/CommentBlockTest.php
similarity index 98%
rename from core/modules/comment/src/Tests/CommentBlockTest.php
rename to core/modules/comment/tests/src/Functional/CommentBlockTest.php
index de92238..e7e347b 100644
--- a/core/modules/comment/src/Tests/CommentBlockTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\user\RoleInterface;
diff --git a/core/modules/comment/src/Tests/CommentBookTest.php b/core/modules/comment/tests/src/Functional/CommentBookTest.php
similarity index 94%
rename from core/modules/comment/src/Tests/CommentBookTest.php
rename to core/modules/comment/tests/src/Functional/CommentBookTest.php
index b23028b..6dfb4ff 100644
--- a/core/modules/comment/src/Tests/CommentBookTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentBookTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\CommentInterface;
 use Drupal\node\Entity\Node;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\comment\Entity\Comment;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group comment
  */
-class CommentBookTest extends WebTestBase {
+class CommentBookTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/comment/src/Tests/CommentCSSTest.php b/core/modules/comment/tests/src/Functional/CommentCSSTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentCSSTest.php
rename to core/modules/comment/tests/src/Functional/CommentCSSTest.php
index f015f3f..262d0b4 100644
--- a/core/modules/comment/src/Tests/CommentCSSTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentCSSTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\comment\CommentInterface;
diff --git a/core/modules/comment/src/Tests/CommentCacheTagsTest.php b/core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentCacheTagsTest.php
rename to core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php
index 3c7ab00..35303d6 100644
--- a/core/modules/comment/src/Tests/CommentCacheTagsTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\CommentManagerInterface;
diff --git a/core/modules/comment/src/Tests/CommentFieldsTest.php b/core/modules/comment/tests/src/Functional/CommentFieldsTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentFieldsTest.php
rename to core/modules/comment/tests/src/Functional/CommentFieldsTest.php
index 46de1be..297c705 100644
--- a/core/modules/comment/src/Tests/CommentFieldsTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentFieldsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/comment/src/Tests/CommentInterfaceTest.php b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentInterfaceTest.php
rename to core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
index ba43224..a23f302 100644
--- a/core/modules/comment/src/Tests/CommentInterfaceTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\CommentManagerInterface;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
diff --git a/core/modules/comment/src/Tests/CommentLanguageTest.php b/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
similarity index 97%
rename from core/modules/comment/src/Tests/CommentLanguageTest.php
rename to core/modules/comment/tests/src/Functional/CommentLanguageTest.php
index c60f827..278ad9f 100644
--- a/core/modules/comment/src/Tests/CommentLanguageTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\Entity\Comment;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for comment language.
  *
  * @group comment
  */
-class CommentLanguageTest extends WebTestBase {
+class CommentLanguageTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/comment/src/Tests/CommentLinksAlterTest.php b/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php
similarity index 94%
rename from core/modules/comment/src/Tests/CommentLinksAlterTest.php
rename to core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php
index 22ff587..994bcda 100644
--- a/core/modules/comment/src/Tests/CommentLinksAlterTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 /**
  * Tests comment links altering.
diff --git a/core/modules/comment/src/Tests/CommentLinksTest.php b/core/modules/comment/tests/src/Functional/CommentLinksTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentLinksTest.php
rename to core/modules/comment/tests/src/Functional/CommentLinksTest.php
index 1115f57..20abe1b 100644
--- a/core/modules/comment/src/Tests/CommentLinksTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentLinksTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\Core\Language\LanguageInterface;
diff --git a/core/modules/comment/src/Tests/CommentNewIndicatorTest.php b/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentNewIndicatorTest.php
rename to core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
index 6d89d4a..fd2c0e8 100644
--- a/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Language\LanguageInterface;
diff --git a/core/modules/comment/src/Tests/CommentNodeAccessTest.php b/core/modules/comment/tests/src/Functional/CommentNodeAccessTest.php
similarity index 98%
rename from core/modules/comment/src/Tests/CommentNodeAccessTest.php
rename to core/modules/comment/tests/src/Functional/CommentNodeAccessTest.php
index e69bfde..3105d5b 100644
--- a/core/modules/comment/src/Tests/CommentNodeAccessTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentNodeAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\CommentManagerInterface;
 
diff --git a/core/modules/comment/src/Tests/CommentNodeChangesTest.php b/core/modules/comment/tests/src/Functional/CommentNodeChangesTest.php
similarity index 96%
rename from core/modules/comment/src/Tests/CommentNodeChangesTest.php
rename to core/modules/comment/tests/src/Functional/CommentNodeChangesTest.php
index 9fed4df..ce0dc79 100644
--- a/core/modules/comment/src/Tests/CommentNodeChangesTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentNodeChangesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\Entity\Comment;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentNonNodeTest.php
rename to core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
index 1b37c1f..df8b1c7 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Entity\Comment;
@@ -10,7 +10,7 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\user\RoleInterface;
 
@@ -19,7 +19,7 @@
  *
  * @group comment
  */
-class CommentNonNodeTest extends WebTestBase {
+class CommentNonNodeTest extends BrowserTestBase {
 
   use FieldUiTestTrait;
   use CommentTestTrait;
diff --git a/core/modules/comment/src/Tests/CommentPagerTest.php b/core/modules/comment/tests/src/Functional/CommentPagerTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentPagerTest.php
rename to core/modules/comment/tests/src/Functional/CommentPagerTest.php
index aa7d099..385aa34 100644
--- a/core/modules/comment/src/Tests/CommentPagerTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentPagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\CommentManagerInterface;
 use Drupal\Component\Utility\SafeMarkup;
diff --git a/core/modules/comment/src/Tests/CommentPreviewTest.php b/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentPreviewTest.php
rename to core/modules/comment/tests/src/Functional/CommentPreviewTest.php
index 837a78a..ef42870 100644
--- a/core/modules/comment/src/Tests/CommentPreviewTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\CommentManagerInterface;
 use Drupal\Component\Render\MarkupInterface;
diff --git a/core/modules/comment/src/Tests/CommentRssTest.php b/core/modules/comment/tests/src/Functional/CommentRssTest.php
similarity index 97%
rename from core/modules/comment/src/Tests/CommentRssTest.php
rename to core/modules/comment/tests/src/Functional/CommentRssTest.php
index ec673df..195a01b 100644
--- a/core/modules/comment/src/Tests/CommentRssTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentRssTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\Core\Cache\Cache;
diff --git a/core/modules/comment/src/Tests/CommentStatisticsTest.php b/core/modules/comment/tests/src/Functional/CommentStatisticsTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentStatisticsTest.php
rename to core/modules/comment/tests/src/Functional/CommentStatisticsTest.php
index 0c370d1..81e52c3 100644
--- a/core/modules/comment/src/Tests/CommentStatisticsTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentStatisticsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\CommentManagerInterface;
 use Drupal\comment\Entity\Comment;
diff --git a/core/modules/comment/src/Tests/CommentTestBase.php b/core/modules/comment/tests/src/Functional/CommentTestBase.php
similarity index 98%
rename from core/modules/comment/src/Tests/CommentTestBase.php
rename to core/modules/comment/tests/src/Functional/CommentTestBase.php
index c99dd32..b1e6825 100644
--- a/core/modules/comment/src/Tests/CommentTestBase.php
+++ b/core/modules/comment/tests/src/Functional/CommentTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\Entity\CommentType;
 use Drupal\comment\Entity\Comment;
@@ -8,12 +8,12 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Provides setup and helper methods for comment tests.
  */
-abstract class CommentTestBase extends WebTestBase {
+abstract class CommentTestBase extends BrowserTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/comment/src/Tests/CommentTestTrait.php b/core/modules/comment/tests/src/Functional/CommentTestTrait.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentTestTrait.php
rename to core/modules/comment/tests/src/Functional/CommentTestTrait.php
index f22d80f..7536a039 100644
--- a/core/modules/comment/src/Tests/CommentTestTrait.php
+++ b/core/modules/comment/tests/src/Functional/CommentTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
diff --git a/core/modules/comment/src/Tests/CommentThreadingTest.php b/core/modules/comment/tests/src/Functional/CommentThreadingTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentThreadingTest.php
rename to core/modules/comment/tests/src/Functional/CommentThreadingTest.php
index c8ea93e..82b4342 100644
--- a/core/modules/comment/src/Tests/CommentThreadingTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentThreadingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\CommentManagerInterface;
 
diff --git a/core/modules/comment/src/Tests/CommentTitleTest.php b/core/modules/comment/tests/src/Functional/CommentTitleTest.php
similarity index 98%
rename from core/modules/comment/src/Tests/CommentTitleTest.php
rename to core/modules/comment/tests/src/Functional/CommentTitleTest.php
index aab1cf5..693f5d0 100644
--- a/core/modules/comment/src/Tests/CommentTitleTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTitleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 /**
  * Tests to ensure that appropriate and accessible markup is created for comment
diff --git a/core/modules/comment/src/Tests/CommentTokenReplaceTest.php b/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentTokenReplaceTest.php
rename to core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php
index c7b7227..d01282f 100644
--- a/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\Component\Render\FormattableMarkup;
diff --git a/core/modules/comment/src/Tests/CommentTranslationUITest.php b/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentTranslationUITest.php
rename to core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
index e89bd3f..68ae4bc 100644
--- a/core/modules/comment/src/Tests/CommentTranslationUITest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\content_translation\Tests\ContentTranslationUITestBase;
diff --git a/core/modules/comment/src/Tests/CommentTypeTest.php b/core/modules/comment/tests/src/Functional/CommentTypeTest.php
similarity index 99%
rename from core/modules/comment/src/Tests/CommentTypeTest.php
rename to core/modules/comment/tests/src/Functional/CommentTypeTest.php
index fb5028f..ce44534 100644
--- a/core/modules/comment/src/Tests/CommentTypeTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 use Drupal\comment\Entity\Comment;
 use Drupal\comment\Entity\CommentType;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
diff --git a/core/modules/comment/src/Tests/CommentUninstallTest.php b/core/modules/comment/tests/src/Functional/CommentUninstallTest.php
similarity index 95%
rename from core/modules/comment/src/Tests/CommentUninstallTest.php
rename to core/modules/comment/tests/src/Functional/CommentUninstallTest.php
index 4d86df9..42c2edd 100644
--- a/core/modules/comment/src/Tests/CommentUninstallTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentUninstallTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\comment\Tests;
+namespace Drupal\Tests\comment\Functional;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\Core\Extension\ModuleUninstallValidatorException;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests comment module uninstallation.
  *
  * @group comment
  */
-class CommentUninstallTest extends WebTestBase {
+class CommentUninstallTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php b/core/modules/config/tests/src/Functional/AssertConfigEntityImportTrait.php
similarity index 96%
rename from core/modules/config/src/Tests/AssertConfigEntityImportTrait.php
rename to core/modules/config/tests/src/Functional/AssertConfigEntityImportTrait.php
index 0441444..2612ba3 100644
--- a/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php
+++ b/core/modules/config/tests/src/Functional/AssertConfigEntityImportTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 
diff --git a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php b/core/modules/config/tests/src/Functional/CacheabilityMetadataConfigOverrideIntegrationTest.php
similarity index 94%
rename from core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php
rename to core/modules/config/tests/src/Functional/CacheabilityMetadataConfigOverrideIntegrationTest.php
index 3ef0754..09aea50 100644
--- a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php
+++ b/core/modules/config/tests/src/Functional/CacheabilityMetadataConfigOverrideIntegrationTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests if configuration overrides correctly affect cacheability metadata.
  *
  * @group config
  */
-class CacheabilityMetadataConfigOverrideIntegrationTest extends WebTestBase {
+class CacheabilityMetadataConfigOverrideIntegrationTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/config/src/Tests/ConfigDependencyWebTest.php b/core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php
similarity index 97%
rename from core/modules/config/src/Tests/ConfigDependencyWebTest.php
rename to core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php
index 5eb5206..c243e9a 100644
--- a/core/modules/config/src/Tests/ConfigDependencyWebTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\Entity\ConfigEntityStorage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests configuration entities.
  *
  * @group config
  */
-class ConfigDependencyWebTest extends WebTestBase {
+class ConfigDependencyWebTest extends BrowserTestBase {
 
   /**
    * The maximum length for the entity storage used in this test.
diff --git a/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php b/core/modules/config/tests/src/Functional/ConfigEntityFormOverrideTest.php
similarity index 94%
rename from core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php
rename to core/modules/config/tests/src/Functional/ConfigEntityFormOverrideTest.php
index 92693c4..0ca50a7 100644
--- a/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigEntityFormOverrideTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that config overrides do not bleed through in entity forms and lists.
  *
  * @group config
  */
-class ConfigEntityFormOverrideTest extends WebTestBase {
+class ConfigEntityFormOverrideTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/config/src/Tests/ConfigEntityListMultilingualTest.php b/core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php
similarity index 92%
rename from core/modules/config/src/Tests/ConfigEntityListMultilingualTest.php
rename to core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php
index f5c12d8..6c40ded 100644
--- a/core/modules/config/src/Tests/ConfigEntityListMultilingualTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group config
  */
-class ConfigEntityListMultilingualTest extends WebTestBase {
+class ConfigEntityListMultilingualTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config/src/Tests/ConfigEntityListTest.php b/core/modules/config/tests/src/Functional/ConfigEntityListTest.php
similarity index 98%
rename from core/modules/config/src/Tests/ConfigEntityListTest.php
rename to core/modules/config/tests/src/Functional/ConfigEntityListTest.php
index 9d31de0..faccf48 100644
--- a/core/modules/config/src/Tests/ConfigEntityListTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigEntityListTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\config_test\Entity\ConfigTest;
 use Drupal\Core\Entity\EntityStorageInterface;
 
@@ -11,7 +11,7 @@
  *
  * @group config
  */
-class ConfigEntityListTest extends WebTestBase {
+class ConfigEntityListTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config/src/Tests/ConfigEntityStatusUITest.php b/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
similarity index 89%
rename from core/modules/config/src/Tests/ConfigEntityStatusUITest.php
rename to core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
index 95dd9da..9ae9412 100644
--- a/core/modules/config/src/Tests/ConfigEntityStatusUITest.php
+++ b/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests configuration entity status UI functionality.
  *
  * @group config
  */
-class ConfigEntityStatusUITest extends WebTestBase {
+class ConfigEntityStatusUITest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config/src/Tests/ConfigEntityTest.php b/core/modules/config/tests/src/Functional/ConfigEntityTest.php
similarity index 99%
rename from core/modules/config/src/Tests/ConfigEntityTest.php
rename to core/modules/config/tests/src/Functional/ConfigEntityTest.php
index a8a8f0f..33f0ee1 100644
--- a/core/modules/config/src/Tests/ConfigEntityTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\EntityMalformedException;
@@ -8,14 +8,14 @@
 use Drupal\Core\Config\Entity\ConfigEntityStorage;
 use Drupal\Core\Config\Entity\Exception\ConfigEntityIdLengthException;
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests configuration entities.
  *
  * @group config
  */
-class ConfigEntityTest extends WebTestBase {
+class ConfigEntityTest extends BrowserTestBase {
 
   /**
    * The maximum length for the entity storage used in this test.
diff --git a/core/modules/config/src/Tests/ConfigExportImportUITest.php b/core/modules/config/tests/src/Functional/ConfigExportImportUITest.php
similarity index 99%
rename from core/modules/config/src/Tests/ConfigExportImportUITest.php
rename to core/modules/config/tests/src/Functional/ConfigExportImportUITest.php
index 828d4aa..28d1d94 100644
--- a/core/modules/config/src/Tests/ConfigExportImportUITest.php
+++ b/core/modules/config/tests/src/Functional/ConfigExportImportUITest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Archiver\ArchiveTar;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the user interface for importing/exporting configuration.
@@ -17,7 +17,7 @@
  *
  * @group config
  */
-class ConfigExportImportUITest extends WebTestBase {
+class ConfigExportImportUITest extends BrowserTestBase {
 
   /**
    * The contents of the config export tarball, held between test methods.
diff --git a/core/modules/config/src/Tests/ConfigExportUITest.php b/core/modules/config/tests/src/Functional/ConfigExportUITest.php
similarity index 96%
rename from core/modules/config/src/Tests/ConfigExportUITest.php
rename to core/modules/config/tests/src/Functional/ConfigExportUITest.php
index 413ce29..5de1d81 100644
--- a/core/modules/config/src/Tests/ConfigExportUITest.php
+++ b/core/modules/config/tests/src/Functional/ConfigExportUITest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Archiver\Tar;
 use Drupal\Core\Serialization\Yaml;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the user interface for exporting configuration.
  *
  * @group config
  */
-class ConfigExportUITest extends WebTestBase {
+class ConfigExportUITest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config/src/Tests/ConfigFormOverrideTest.php b/core/modules/config/tests/src/Functional/ConfigFormOverrideTest.php
similarity index 91%
rename from core/modules/config/src/Tests/ConfigFormOverrideTest.php
rename to core/modules/config/tests/src/Functional/ConfigFormOverrideTest.php
index ffd4428..ff04143 100644
--- a/core/modules/config/src/Tests/ConfigFormOverrideTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigFormOverrideTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests config overrides do not appear on forms that extend ConfigFormBase.
@@ -10,7 +10,7 @@
  * @group config
  * @see \Drupal\Core\Form\ConfigFormBase
  */
-class ConfigFormOverrideTest extends WebTestBase {
+class ConfigFormOverrideTest extends BrowserTestBase {
 
   /**
    * Tests that overrides do not affect forms.
diff --git a/core/modules/config/src/Tests/ConfigImportAllTest.php b/core/modules/config/tests/src/Functional/ConfigImportAllTest.php
similarity index 99%
rename from core/modules/config/src/Tests/ConfigImportAllTest.php
rename to core/modules/config/tests/src/Functional/ConfigImportAllTest.php
index baeacb9..213c8b8 100644
--- a/core/modules/config/src/Tests/ConfigImportAllTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigImportAllTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\StorageComparer;
 use Drupal\filter\Entity\FilterFormat;
diff --git a/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php b/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php
similarity index 94%
rename from core/modules/config/src/Tests/ConfigImportInstallProfileTest.php
rename to core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php
index 0c74c7f..b11d19f 100644
--- a/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the importing/exporting configuration based on the install profile.
  *
  * @group config
  */
-class ConfigImportInstallProfileTest extends WebTestBase {
+class ConfigImportInstallProfileTest extends BrowserTestBase {
 
   /**
    * The profile to install as a basis for testing.
diff --git a/core/modules/config/src/Tests/ConfigImportUITest.php b/core/modules/config/tests/src/Functional/ConfigImportUITest.php
similarity index 99%
rename from core/modules/config/src/Tests/ConfigImportUITest.php
rename to core/modules/config/tests/src/Functional/ConfigImportUITest.php
index afa9b99..af43460 100644
--- a/core/modules/config/src/Tests/ConfigImportUITest.php
+++ b/core/modules/config/tests/src/Functional/ConfigImportUITest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\InstallStorage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the user interface for importing/exporting configuration.
  *
  * @group config
  */
-class ConfigImportUITest extends WebTestBase {
+class ConfigImportUITest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/config/src/Tests/ConfigImportUploadTest.php b/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
similarity index 92%
rename from core/modules/config/src/Tests/ConfigImportUploadTest.php
rename to core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
index 9836d77..47c5c52 100644
--- a/core/modules/config/src/Tests/ConfigImportUploadTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests importing configuration from an uploaded file.
  *
  * @group config
  */
-class ConfigImportUploadTest extends WebTestBase {
+class ConfigImportUploadTest extends BrowserTestBase {
 
   /**
    * A user with the 'import configuration' permission.
diff --git a/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php b/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
similarity index 97%
rename from core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php
rename to core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
index c2cea6d..31de4b7 100644
--- a/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Config\InstallStorage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Config\FileStorage;
 use Drupal\system\Entity\Action;
 use Drupal\tour\Entity\Tour;
@@ -15,7 +15,7 @@
  *
  * @group config
  */
-class ConfigInstallProfileOverrideTest extends WebTestBase {
+class ConfigInstallProfileOverrideTest extends BrowserTestBase {
 
   /**
    * The profile to install as a basis for testing.
diff --git a/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php b/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php
similarity index 98%
rename from core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php
rename to core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php
index 3371198..6adff95 100644
--- a/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Serialization\Yaml;
diff --git a/core/modules/config/src/Tests/ConfigInstallWebTest.php b/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
similarity index 98%
rename from core/modules/config/src/Tests/ConfigInstallWebTest.php
rename to core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
index 083b123..ca20ec7 100644
--- a/core/modules/config/src/Tests/ConfigInstallWebTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\PreExistingConfigException;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests installation and removal of configuration objects in install, disable
@@ -13,7 +13,7 @@
  *
  * @group config
  */
-class ConfigInstallWebTest extends WebTestBase {
+class ConfigInstallWebTest extends BrowserTestBase {
 
   /**
    * The admin user used in this test.
diff --git a/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php b/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
similarity index 95%
rename from core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php
rename to core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
index f966e5f..5aa194e 100644
--- a/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests language overrides applied through the website.
  *
  * @group config
  */
-class ConfigLanguageOverrideWebTest extends WebTestBase {
+class ConfigLanguageOverrideWebTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/config/src/Tests/ConfigOtherModuleTest.php b/core/modules/config/tests/src/Functional/ConfigOtherModuleTest.php
similarity index 97%
rename from core/modules/config/src/Tests/ConfigOtherModuleTest.php
rename to core/modules/config/tests/src/Functional/ConfigOtherModuleTest.php
index 56c4b31..7834bc8 100644
--- a/core/modules/config/src/Tests/ConfigOtherModuleTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigOtherModuleTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests default configuration provided by a module that does not own it.
  *
  * @group config
  */
-class ConfigOtherModuleTest extends WebTestBase {
+class ConfigOtherModuleTest extends BrowserTestBase {
 
   /**
    * Tests enabling the provider of the default configuration first.
diff --git a/core/modules/config/src/Tests/ConfigSingleImportExportTest.php b/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
similarity index 98%
rename from core/modules/config/src/Tests/ConfigSingleImportExportTest.php
rename to core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
index 53f6164..e5d8366 100644
--- a/core/modules/config/src/Tests/ConfigSingleImportExportTest.php
+++ b/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Serialization\Yaml;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the user interface for importing/exporting a single configuration.
  *
  * @group config
  */
-class ConfigSingleImportExportTest extends WebTestBase {
+class ConfigSingleImportExportTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php b/core/modules/config/tests/src/Functional/LanguageNegotiationFormOverrideTest.php
similarity index 93%
rename from core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php
rename to core/modules/config/tests/src/Functional/LanguageNegotiationFormOverrideTest.php
index 1aa4c9a..9c793b3 100644
--- a/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php
+++ b/core/modules/config/tests/src/Functional/LanguageNegotiationFormOverrideTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests language-negotiation overrides are not on language-negotiation form.
@@ -10,7 +10,7 @@
  * @group config
  * @see \Drupal\Core\Form\ConfigFormBase
  */
-class LanguageNegotiationFormOverrideTest extends WebTestBase {
+class LanguageNegotiationFormOverrideTest extends BrowserTestBase {
 
   public static $modules = array('language', 'locale', 'locale_test');
 
diff --git a/core/modules/config/src/Tests/SchemaCheckTestTrait.php b/core/modules/config/tests/src/Functional/SchemaCheckTestTrait.php
similarity index 98%
rename from core/modules/config/src/Tests/SchemaCheckTestTrait.php
rename to core/modules/config/tests/src/Functional/SchemaCheckTestTrait.php
index ede1e56..684ab9d 100644
--- a/core/modules/config/src/Tests/SchemaCheckTestTrait.php
+++ b/core/modules/config/tests/src/Functional/SchemaCheckTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Config\Schema\SchemaCheckTrait;
diff --git a/core/modules/config/src/Tests/SchemaConfigListenerWebTest.php b/core/modules/config/tests/src/Functional/SchemaConfigListenerWebTest.php
similarity index 93%
rename from core/modules/config/src/Tests/SchemaConfigListenerWebTest.php
rename to core/modules/config/tests/src/Functional/SchemaConfigListenerWebTest.php
index 45aabc8..4104606 100644
--- a/core/modules/config/src/Tests/SchemaConfigListenerWebTest.php
+++ b/core/modules/config/tests/src/Functional/SchemaConfigListenerWebTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\Schema\SchemaIncompleteException;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the functionality of ConfigSchemaChecker in WebTestBase tests.
  *
  * @group config
  */
-class SchemaConfigListenerWebTest extends WebTestBase {
+class SchemaConfigListenerWebTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
similarity index 91%
rename from core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php
rename to core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
index ceb69d0..9ddbdf3 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the content translation behaviours on date formats.
  *
  * @group config_translation
  */
-class ConfigTranslationDateFormatUiTest extends WebTestBase {
+class ConfigTranslationDateFormatUiTest extends BrowserTestBase {
 
   public static $modules = array(
     'language',
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationFormTest.php
similarity index 92%
rename from core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
rename to core/modules/config_translation/tests/src/Functional/ConfigTranslationFormTest.php
index 648f047..d787141 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationFormTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for altering configuration translation forms.
  *
  * @group config_translation
  */
-class ConfigTranslationFormTest extends WebTestBase {
+class ConfigTranslationFormTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php
similarity index 97%
rename from core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php
rename to core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php
index 7daa305..6d0546f 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\simpletest\InstallerTestBase;
 
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
similarity index 99%
rename from core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
rename to core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
index 8bd3d71..db4af56 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\shortcut\Entity\ShortcutSet;
 use Drupal\contact\Entity\ContactForm;
 use Drupal\filter\Entity\FilterFormat;
@@ -19,7 +19,7 @@
  * @group config_translation
  * @see \Drupal\config_translation\Tests\ConfigTranslationViewListUiTest
  */
-class ConfigTranslationListUiTest extends WebTestBase {
+class ConfigTranslationListUiTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
similarity index 97%
rename from core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
rename to core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
index e7c58fd..2830087 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Translate settings and entities to various languages.
  *
  * @group config_translation
  */
-class ConfigTranslationOverviewTest extends WebTestBase {
+class ConfigTranslationOverviewTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
similarity index 99%
rename from core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
rename to core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
index b69357e..138e76c 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\Html;
@@ -12,14 +12,14 @@
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Translate settings and entities to various languages.
  *
  * @group config_translation
  */
-class ConfigTranslationUiTest extends WebTestBase {
+class ConfigTranslationUiTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
similarity index 92%
rename from core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.php
rename to core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
index ab51a43..559b8c7 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Verifies theme configuration translation settings.
  *
  * @group config_translation
  */
-class ConfigTranslationUiThemeTest extends WebTestBase {
+class ConfigTranslationUiThemeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationViewListUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
similarity index 96%
rename from core/modules/config_translation/src/Tests/ConfigTranslationViewListUiTest.php
rename to core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
index bccbd88..9a9aee3 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationViewListUiTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\views_ui\Tests\UITestBase;
 
diff --git a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php b/core/modules/contact/tests/src/Functional/ContactAuthenticatedUserTest.php
similarity index 84%
rename from core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
rename to core/modules/contact/tests/src/Functional/ContactAuthenticatedUserTest.php
index eb7c527..4b4a520 100644
--- a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactAuthenticatedUserTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\contact\Tests;
+namespace Drupal\Tests\contact\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests contact form textfields are present if authenticated.
  *
  * @group contact
  */
-class ContactAuthenticatedUserTest extends WebTestBase {
+class ContactAuthenticatedUserTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/contact/src/Tests/ContactLanguageTest.php b/core/modules/contact/tests/src/Functional/ContactLanguageTest.php
similarity index 92%
rename from core/modules/contact/src/Tests/ContactLanguageTest.php
rename to core/modules/contact/tests/src/Functional/ContactLanguageTest.php
index 4623bda..47d1533 100644
--- a/core/modules/contact/src/Tests/ContactLanguageTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactLanguageTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\contact\Tests;
+namespace Drupal\Tests\contact\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests contact messages with language module.
@@ -13,7 +13,7 @@
  *
  * @group contact
  */
-class ContactLanguageTest extends WebTestBase {
+class ContactLanguageTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/contact/src/Tests/ContactPersonalTest.php b/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
similarity index 99%
rename from core/modules/contact/src/Tests/ContactPersonalTest.php
rename to core/modules/contact/tests/src/Functional/ContactPersonalTest.php
index 936aed5..7cae6d7 100644
--- a/core/modules/contact/src/Tests/ContactPersonalTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\contact\Tests;
+namespace Drupal\Tests\contact\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\PlainTextOutput;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @group contact
  */
-class ContactPersonalTest extends WebTestBase {
+class ContactPersonalTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
similarity index 99%
rename from core/modules/contact/src/Tests/ContactSitewideTest.php
rename to core/modules/contact/tests/src/Functional/ContactSitewideTest.php
index c148715..fde63f1 100644
--- a/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\contact\Tests;
+namespace Drupal\Tests\contact\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\contact\Entity\ContactForm;
 use Drupal\Core\Mail\MailFormatHelper;
 use Drupal\Core\Url;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\user\RoleInterface;
 
@@ -18,7 +18,7 @@
  *
  * @group contact
  */
-class ContactSitewideTest extends WebTestBase {
+class ContactSitewideTest extends BrowserTestBase {
 
   use FieldUiTestTrait;
 
diff --git a/core/modules/contact/src/Tests/ContactStorageTest.php b/core/modules/contact/tests/src/Functional/ContactStorageTest.php
similarity index 98%
rename from core/modules/contact/src/Tests/ContactStorageTest.php
rename to core/modules/contact/tests/src/Functional/ContactStorageTest.php
index ad0e8d4..f32233a 100644
--- a/core/modules/contact/src/Tests/ContactStorageTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactStorageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\contact\Tests;
+namespace Drupal\Tests\contact\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\contact\Entity\Message;
diff --git a/core/modules/content_moderation/src/Tests/ModerationFormTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
similarity index 98%
rename from core/modules/content_moderation/src/Tests/ModerationFormTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
index d6c92b9..f41b500 100644
--- a/core/modules/content_moderation/src/Tests/ModerationFormTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 /**
  * Tests the moderation form, specifically on nodes.
diff --git a/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
similarity index 99%
rename from core/modules/content_moderation/src/Tests/ModerationLocaleTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
index 0d40356..77dae1b 100644
--- a/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 /**
  * Test content_moderation functionality with localization and translation.
diff --git a/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
similarity index 98%
rename from core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
index 03a4b0e..81014b0 100644
--- a/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
diff --git a/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php
similarity index 98%
rename from core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php
index a819caf..1b65cc7 100644
--- a/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 use Drupal\Core\Url;
 use Drupal\node\Entity\Node;
diff --git a/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
similarity index 97%
rename from core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
index debb32c..5e30494f 100644
--- a/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 
 /**
diff --git a/core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateStatesTest.php
similarity index 97%
rename from core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationStateStatesTest.php
index 1b394f9..d9ae74c 100644
--- a/core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateStatesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 /**
  * Tests moderation state config entity.
diff --git a/core/modules/content_moderation/src/Tests/ModerationStateTestBase.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
similarity index 96%
rename from core/modules/content_moderation/src/Tests/ModerationStateTestBase.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
index ddd275e..985e091 100644
--- a/core/modules/content_moderation/src/Tests/ModerationStateTestBase.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 use Drupal\Core\Session\AccountInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\Role;
 use Drupal\content_moderation\Entity\ModerationState;
 
 /**
  * Defines a base class for moderation state tests.
  */
-abstract class ModerationStateTestBase extends WebTestBase {
+abstract class ModerationStateTestBase extends BrowserTestBase {
 
   /**
    * Profile to use.
diff --git a/core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateTransitionsTest.php
similarity index 98%
rename from core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php
rename to core/modules/content_moderation/tests/src/Functional/ModerationStateTransitionsTest.php
index 0495e48..e7b0842 100644
--- a/core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateTransitionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 /**
  * Tests moderation state transition config entity.
diff --git a/core/modules/content_moderation/src/Tests/NodeAccessTest.php b/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
similarity index 98%
rename from core/modules/content_moderation/src/Tests/NodeAccessTest.php
rename to core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
index 1b05406..40e4bd8 100644
--- a/core/modules/content_moderation/src/Tests/NodeAccessTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 /**
  * Tests permission access control around nodes.
diff --git a/core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php b/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php
similarity index 93%
rename from core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php
index e94802a..a54628d 100644
--- a/core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 /**
  * Tests the test content translation UI with the test entity.
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php
similarity index 97%
rename from core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php
index efbd3c1..b6f6a77 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @group content_translation
  */
-class ContentTranslationContextualLinksTest extends WebTestBase {
+class ContentTranslationContextualLinksTest extends BrowserTestBase {
 
   /**
    * The bundle being tested.
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php
similarity index 94%
rename from core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php
index fb13642..a999e76 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test enabling content translation module.
  *
  * @group content_translation
  */
-class ContentTranslationEnableTest extends WebTestBase {
+class ContentTranslationEnableTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
similarity index 91%
rename from core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
index 03f30a1..c735716 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the content translation behaviours on entity bundle UI.
  *
  * @group content_translation
  */
-class ContentTranslationEntityBundleUITest extends WebTestBase {
+class ContentTranslationEntityBundleUITest extends BrowserTestBase {
 
   public static $modules = array('language', 'content_translation', 'node', 'comment', 'field_ui');
 
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationMetadataFieldsTest.php
similarity index 99%
rename from core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationMetadataFieldsTest.php
index a45fda4..0f13079 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationMetadataFieldsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 /**
  * Tests the Content Translation metadata fields handling.
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationOperationsTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
similarity index 98%
rename from core/modules/content_translation/src/Tests/ContentTranslationOperationsTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
index 90449da..611d5d9 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationOperationsTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Tests\NodeTestBase;
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
similarity index 99%
rename from core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
index d7490c0..0575423 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
@@ -8,14 +8,14 @@
 use Drupal\Core\Language\Language;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ContentLanguageSettings;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the content translation settings UI.
  *
  * @group content_translation
  */
-class ContentTranslationSettingsTest extends WebTestBase {
+class ContentTranslationSettingsTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationStandardFieldsTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationStandardFieldsTest.php
similarity index 93%
rename from core/modules/content_translation/src/Tests/ContentTranslationStandardFieldsTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationStandardFieldsTest.php
index 8d2ec13..37178ca 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationStandardFieldsTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationStandardFieldsTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the Content translation settings using the standard profile.
  *
  * @group content_translation
  */
-class ContentTranslationStandardFieldsTest extends WebTestBase {
+class ContentTranslationStandardFieldsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
similarity index 99%
rename from core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
index 5f881a7..5cb8bc1 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php
similarity index 97%
rename from core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php
index 5d9a8d0..822cbdd 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Base class for content translation tests.
  */
-abstract class ContentTranslationTestBase extends WebTestBase {
+abstract class ContentTranslationTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationUISkipTest.php
similarity index 85%
rename from core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationUISkipTest.php
index 2f8be23..74d5de5 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationUISkipTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the content translation UI check skip.
  *
  * @group content_translation
  */
-class ContentTranslationUISkipTest extends WebTestBase {
+class ContentTranslationUISkipTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
similarity index 99%
rename from core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
index 3c50983..636acc4 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\EntityInterface;
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
similarity index 99%
rename from core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
index b1524ee..c945081 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Language\LanguageInterface;
diff --git a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
similarity index 98%
rename from core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
rename to core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
index e5d2c85..5b0238e 100644
--- a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
+++ b/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\contextual\Tests;
+namespace Drupal\Tests\contextual\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Url;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Template\Attribute;
 
 /**
@@ -14,7 +14,7 @@
  *
  * @group contextual
  */
-class ContextualDynamicContextTest extends WebTestBase {
+class ContextualDynamicContextTest extends BrowserTestBase {
 
   /**
    * A user with permission to access contextual links and edit content.
diff --git a/core/modules/datetime/src/Tests/DateTestBase.php b/core/modules/datetime/tests/src/Functional/DateTestBase.php
similarity index 97%
rename from core/modules/datetime/src/Tests/DateTestBase.php
rename to core/modules/datetime/tests/src/Functional/DateTestBase.php
index 0f1277e..9bf329d 100644
--- a/core/modules/datetime/src/Tests/DateTestBase.php
+++ b/core/modules/datetime/tests/src/Functional/DateTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\datetime\Tests;
+namespace Drupal\Tests\datetime\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
@@ -9,12 +9,12 @@
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Provides a base class for testing Datetime field functionality.
  */
-abstract class DateTestBase extends WebTestBase {
+abstract class DateTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
similarity index 99%
rename from core/modules/datetime/src/Tests/DateTimeFieldTest.php
rename to core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
index c729b23..ce3bad1 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\datetime\Tests;
+namespace Drupal\Tests\datetime\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
similarity index 99%
rename from core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
rename to core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
index 2afb5f5..b5a64d1 100644
--- a/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
+++ b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\datetime_range\Tests;
+namespace Drupal\Tests\datetime_range\Functional;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/dblog/src/Tests/ConnectionFailureTest.php b/core/modules/dblog/tests/src/Functional/ConnectionFailureTest.php
similarity index 91%
rename from core/modules/dblog/src/Tests/ConnectionFailureTest.php
rename to core/modules/dblog/tests/src/Functional/ConnectionFailureTest.php
index d800224..df088a3 100644
--- a/core/modules/dblog/src/Tests/ConnectionFailureTest.php
+++ b/core/modules/dblog/tests/src/Functional/ConnectionFailureTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\dblog\Tests;
+namespace Drupal\Tests\dblog\Functional;
 
 use Drupal\Core\Database\Database;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests logging of connection failures.
  *
  * @group dblog
  */
-class ConnectionFailureTest extends WebTestBase {
+class ConnectionFailureTest extends BrowserTestBase {
 
   public static $modules = array('dblog');
 
diff --git a/core/modules/dblog/src/Tests/DbLogTest.php b/core/modules/dblog/tests/src/Functional/DbLogTest.php
similarity index 99%
rename from core/modules/dblog/src/Tests/DbLogTest.php
rename to core/modules/dblog/tests/src/Functional/DbLogTest.php
index 886f768..7ca0964 100644
--- a/core/modules/dblog/src/Tests/DbLogTest.php
+++ b/core/modules/dblog/tests/src/Functional/DbLogTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\dblog\Tests;
+namespace Drupal\Tests\dblog\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Logger\RfcLogLevel;
 use Drupal\Core\Url;
 use Drupal\dblog\Controller\DbLogController;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Generate events and verify dblog entries; verify user access to log reports
@@ -15,7 +15,7 @@
  *
  * @group dblog
  */
-class DbLogTest extends WebTestBase {
+class DbLogTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/dynamic_page_cache/src/Tests/DynamicPageCacheIntegrationTest.php b/core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php
similarity index 97%
rename from core/modules/dynamic_page_cache/src/Tests/DynamicPageCacheIntegrationTest.php
rename to core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php
index 067a104..5b8e5d7 100644
--- a/core/modules/dynamic_page_cache/src/Tests/DynamicPageCacheIntegrationTest.php
+++ b/core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\dynamic_page_cache\Tests;
+namespace Drupal\Tests\dynamic_page_cache\Functional;
 
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\Core\Url;
 use Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Enables the Dynamic Page Cache and tests it in various scenarios.
@@ -20,7 +20,7 @@
  *
  * @see \Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber
  */
-class DynamicPageCacheIntegrationTest extends WebTestBase {
+class DynamicPageCacheIntegrationTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/editor/src/Tests/EditorAdminTest.php b/core/modules/editor/tests/src/Functional/EditorAdminTest.php
similarity index 98%
rename from core/modules/editor/src/Tests/EditorAdminTest.php
rename to core/modules/editor/tests/src/Functional/EditorAdminTest.php
index 97d47b1..8ac2459 100644
--- a/core/modules/editor/src/Tests/EditorAdminTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorAdminTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\editor\Tests;
+namespace Drupal\Tests\editor\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests administration of text editors.
  *
  * @group editor
  */
-class EditorAdminTest extends WebTestBase {
+class EditorAdminTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/editor/src/Tests/EditorLoadingTest.php b/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
similarity index 98%
rename from core/modules/editor/src/Tests/EditorLoadingTest.php
rename to core/modules/editor/tests/src/Functional/EditorLoadingTest.php
index 88055e9..d8bba07 100644
--- a/core/modules/editor/src/Tests/EditorLoadingTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\editor\Tests;
+namespace Drupal\Tests\editor\Functional;
 
 use Drupal\editor\Entity\Editor;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @group editor
  */
-class EditorLoadingTest extends WebTestBase {
+class EditorLoadingTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/editor/src/Tests/EditorSecurityTest.php b/core/modules/editor/tests/src/Functional/EditorSecurityTest.php
similarity index 99%
rename from core/modules/editor/src/Tests/EditorSecurityTest.php
rename to core/modules/editor/tests/src/Functional/EditorSecurityTest.php
index c771439..3dd3c91 100644
--- a/core/modules/editor/src/Tests/EditorSecurityTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorSecurityTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\editor\Tests;
+namespace Drupal\Tests\editor\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\editor\Entity\Editor;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group editor
  */
-class EditorSecurityTest extends WebTestBase {
+class EditorSecurityTest extends BrowserTestBase {
 
   /**
    * The sample content to use in all tests.
diff --git a/core/modules/editor/src/Tests/EditorUploadImageScaleTest.php b/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
similarity index 98%
rename from core/modules/editor/src/Tests/EditorUploadImageScaleTest.php
rename to core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
index 5ac88c7..58cce8d 100644
--- a/core/modules/editor/src/Tests/EditorUploadImageScaleTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\editor\Tests;
+namespace Drupal\Tests\editor\Functional;
 
 use Drupal\editor\Entity\Editor;
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests scaling of inline images.
  *
  * @group editor
  */
-class EditorUploadImageScaleTest extends WebTestBase {
+class EditorUploadImageScaleTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php b/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php
similarity index 96%
rename from core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php
rename to core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php
index 9a41f6b..3b38138 100644
--- a/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php
+++ b/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\editor\Tests;
+namespace Drupal\Tests\editor\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group editor
  */
-class QuickEditIntegrationLoadingTest extends WebTestBase {
+class QuickEditIntegrationLoadingTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field/src/Tests/FieldAccessTest.php b/core/modules/field/tests/src/Functional/FieldAccessTest.php
similarity index 98%
rename from core/modules/field/src/Tests/FieldAccessTest.php
rename to core/modules/field/tests/src/Functional/FieldAccessTest.php
index 0553406..a9af836 100644
--- a/core/modules/field/src/Tests/FieldAccessTest.php
+++ b/core/modules/field/tests/src/Functional/FieldAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/field/src/Tests/FieldDefaultValueCallbackProvider.php b/core/modules/field/tests/src/Functional/FieldDefaultValueCallbackProvider.php
similarity index 88%
rename from core/modules/field/src/Tests/FieldDefaultValueCallbackProvider.php
rename to core/modules/field/tests/src/Functional/FieldDefaultValueCallbackProvider.php
index 8b3af11..c02a752 100644
--- a/core/modules/field/src/Tests/FieldDefaultValueCallbackProvider.php
+++ b/core/modules/field/tests/src/Functional/FieldDefaultValueCallbackProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 /**
  * Helper class for \Drupal\field\Tests\FieldDefaultValueCallbackTest.
diff --git a/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php b/core/modules/field/tests/src/Functional/FieldDefaultValueCallbackTest.php
similarity index 95%
rename from core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php
rename to core/modules/field/tests/src/Functional/FieldDefaultValueCallbackTest.php
index e7f5a4c..bad2417 100644
--- a/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php
+++ b/core/modules/field/tests/src/Functional/FieldDefaultValueCallbackTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the default value callback.
  *
  * @group field
  */
-class FieldDefaultValueCallbackTest extends WebTestBase {
+class FieldDefaultValueCallbackTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field/src/Tests/FieldHelpTest.php b/core/modules/field/tests/src/Functional/FieldHelpTest.php
similarity index 93%
rename from core/modules/field/src/Tests/FieldHelpTest.php
rename to core/modules/field/tests/src/Functional/FieldHelpTest.php
index 1103320..76affaa 100644
--- a/core/modules/field/src/Tests/FieldHelpTest.php
+++ b/core/modules/field/tests/src/Functional/FieldHelpTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests help display for the Field module.
  *
  * @group field
  */
-class FieldHelpTest extends WebTestBase {
+class FieldHelpTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php b/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php
similarity index 99%
rename from core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
rename to core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php
index e69e04f..7d844f9 100644
--- a/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
+++ b/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/field/src/Tests/FieldTestBase.php b/core/modules/field/tests/src/Functional/FieldTestBase.php
similarity index 94%
rename from core/modules/field/src/Tests/FieldTestBase.php
rename to core/modules/field/tests/src/Functional/FieldTestBase.php
index 4fe944f..40cffac 100644
--- a/core/modules/field/src/Tests/FieldTestBase.php
+++ b/core/modules/field/tests/src/Functional/FieldTestBase.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Parent class for Field API tests.
  */
-abstract class FieldTestBase extends WebTestBase {
+abstract class FieldTestBase extends BrowserTestBase {
 
   /**
    * Generate random values for a field_test field.
diff --git a/core/modules/field/src/Tests/FormTest.php b/core/modules/field/tests/src/Functional/FormTest.php
similarity index 99%
rename from core/modules/field/src/Tests/FormTest.php
rename to core/modules/field/tests/src/Functional/FormTest.php
index 16625a9..b1a434d 100644
--- a/core/modules/field/src/Tests/FormTest.php
+++ b/core/modules/field/tests/src/Functional/FormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
diff --git a/core/modules/field/src/Tests/NestedFormTest.php b/core/modules/field/tests/src/Functional/NestedFormTest.php
similarity index 99%
rename from core/modules/field/src/Tests/NestedFormTest.php
rename to core/modules/field/tests/src/Functional/NestedFormTest.php
index 28dbe55..232fa8e 100644
--- a/core/modules/field/src/Tests/NestedFormTest.php
+++ b/core/modules/field/tests/src/Functional/NestedFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/field/src/Tests/TranslationWebTest.php b/core/modules/field/tests/src/Functional/TranslationWebTest.php
similarity index 99%
rename from core/modules/field/src/Tests/TranslationWebTest.php
rename to core/modules/field/tests/src/Functional/TranslationWebTest.php
index eed78a2..3e0f849 100644
--- a/core/modules/field/src/Tests/TranslationWebTest.php
+++ b/core/modules/field/tests/src/Functional/TranslationWebTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/field/src/Tests/reEnableModuleFieldTest.php b/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
similarity index 96%
rename from core/modules/field/src/Tests/reEnableModuleFieldTest.php
rename to core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
index b718e75..e9f54d9 100644
--- a/core/modules/field/src/Tests/reEnableModuleFieldTest.php
+++ b/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group field
  */
-class reEnableModuleFieldTest extends WebTestBase {
+class reEnableModuleFieldTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field_ui/src/Tests/EntityDisplayModeTest.php b/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
similarity index 97%
rename from core/modules/field_ui/src/Tests/EntityDisplayModeTest.php
rename to core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
index f808a1e..1d2cab0 100644
--- a/core/modules/field_ui/src/Tests/EntityDisplayModeTest.php
+++ b/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the entity display modes UI.
  *
  * @group field_ui
  */
-class EntityDisplayModeTest extends WebTestBase {
+class EntityDisplayModeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field_ui/src/Tests/FieldUIDeleteTest.php b/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
similarity index 96%
rename from core/modules/field_ui/src/Tests/FieldUIDeleteTest.php
rename to core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
index 59469ac..f7f240e 100644
--- a/core/modules/field_ui/src/Tests/FieldUIDeleteTest.php
+++ b/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\views\Tests\ViewTestData;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group field_ui
  */
-class FieldUIDeleteTest extends WebTestBase {
+class FieldUIDeleteTest extends BrowserTestBase {
 
   use FieldUiTestTrait;
 
diff --git a/core/modules/field_ui/src/Tests/FieldUIIndentationTest.php b/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
similarity index 85%
rename from core/modules/field_ui/src/Tests/FieldUIIndentationTest.php
rename to core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
index 898b417..528f2c4 100644
--- a/core/modules/field_ui/src/Tests/FieldUIIndentationTest.php
+++ b/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests indentation on Field UI.
  *
  * @group field_ui
  */
-class FieldUIIndentationTest extends WebTestBase {
+class FieldUIIndentationTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/field_ui/src/Tests/FieldUIRouteTest.php b/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
similarity index 96%
rename from core/modules/field_ui/src/Tests/FieldUIRouteTest.php
rename to core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
index 6533f09..1e954e5 100644
--- a/core/modules/field_ui/src/Tests/FieldUIRouteTest.php
+++ b/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
 use Drupal\Core\Entity\Entity\EntityFormMode;
 use Drupal\Core\Entity\Entity\EntityViewMode;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the functionality of the Field UI route subscriber.
  *
  * @group field_ui
  */
-class FieldUIRouteTest extends WebTestBase {
+class FieldUIRouteTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/field_ui/src/Tests/FieldUiTestTrait.php b/core/modules/field_ui/tests/src/Functional/FieldUiTestTrait.php
similarity index 99%
rename from core/modules/field_ui/src/Tests/FieldUiTestTrait.php
rename to core/modules/field_ui/tests/src/Functional/FieldUiTestTrait.php
index 9bb0ecb..2cded02 100644
--- a/core/modules/field_ui/src/Tests/FieldUiTestTrait.php
+++ b/core/modules/field_ui/tests/src/Functional/FieldUiTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
 /**
  * Provides common functionality for the Field UI test classes.
diff --git a/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
similarity index 99%
rename from core/modules/field_ui/src/Tests/ManageDisplayTest.php
rename to core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
index 4cd2901..4a52c0d 100644
--- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
@@ -15,7 +15,7 @@
  *
  * @group field_ui
  */
-class ManageDisplayTest extends WebTestBase {
+class ManageDisplayTest extends BrowserTestBase {
 
   use FieldUiTestTrait;
 
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/tests/src/Functional/ManageFieldsTest.php
similarity index 99%
rename from core/modules/field_ui/src/Tests/ManageFieldsTest.php
rename to core/modules/field_ui/tests/src/Functional/ManageFieldsTest.php
index cbe9f53..b84f56c 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/tests/src/Functional/ManageFieldsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -8,7 +8,7 @@
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
@@ -16,7 +16,7 @@
  *
  * @group field_ui
  */
-class ManageFieldsTest extends WebTestBase {
+class ManageFieldsTest extends BrowserTestBase {
 
   use FieldUiTestTrait;
   use EntityReferenceTestTrait;
diff --git a/core/modules/file/src/Tests/DownloadTest.php b/core/modules/file/tests/src/Functional/DownloadTest.php
similarity index 99%
rename from core/modules/file/src/Tests/DownloadTest.php
rename to core/modules/file/tests/src/Functional/DownloadTest.php
index e92cef3..1c3766d 100644
--- a/core/modules/file/src/Tests/DownloadTest.php
+++ b/core/modules/file/tests/src/Functional/DownloadTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 /**
  * Tests for download/file transfer functions.
diff --git a/core/modules/file/src/Tests/FileFieldAnonymousSubmissionTest.php b/core/modules/file/tests/src/Functional/FileFieldAnonymousSubmissionTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileFieldAnonymousSubmissionTest.php
rename to core/modules/file/tests/src/Functional/FileFieldAnonymousSubmissionTest.php
index 2286473..07acff0 100644
--- a/core/modules/file/src/Tests/FileFieldAnonymousSubmissionTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldAnonymousSubmissionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\node\Entity\Node;
 use Drupal\user\RoleInterface;
diff --git a/core/modules/file/src/Tests/FileFieldDisplayTest.php b/core/modules/file/tests/src/Functional/FileFieldDisplayTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileFieldDisplayTest.php
rename to core/modules/file/tests/src/Functional/FileFieldDisplayTest.php
index 142751a..0ecc1d0 100644
--- a/core/modules/file/src/Tests/FileFieldDisplayTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldDisplayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\file\Entity\File;
diff --git a/core/modules/file/src/Tests/FileFieldFormatterAccessTest.php b/core/modules/file/tests/src/Functional/FileFieldFormatterAccessTest.php
similarity index 95%
rename from core/modules/file/src/Tests/FileFieldFormatterAccessTest.php
rename to core/modules/file/tests/src/Functional/FileFieldFormatterAccessTest.php
index 4d2aee1..5f2bca1 100644
--- a/core/modules/file/src/Tests/FileFieldFormatterAccessTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldFormatterAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 
 /**
diff --git a/core/modules/file/src/Tests/FileFieldPathTest.php b/core/modules/file/tests/src/Functional/FileFieldPathTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileFieldPathTest.php
rename to core/modules/file/tests/src/Functional/FileFieldPathTest.php
index c9a15de..1e6a1ec 100644
--- a/core/modules/file/src/Tests/FileFieldPathTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldPathTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/file/src/Tests/FileFieldRSSContentTest.php b/core/modules/file/tests/src/Functional/FileFieldRSSContentTest.php
similarity index 98%
rename from core/modules/file/src/Tests/FileFieldRSSContentTest.php
rename to core/modules/file/tests/src/Functional/FileFieldRSSContentTest.php
index 0422514..c6ef4d6 100644
--- a/core/modules/file/src/Tests/FileFieldRSSContentTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldRSSContentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/file/src/Tests/FileFieldRevisionTest.php b/core/modules/file/tests/src/Functional/FileFieldRevisionTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileFieldRevisionTest.php
rename to core/modules/file/tests/src/Functional/FileFieldRevisionTest.php
index f5d00c7..56b846e 100644
--- a/core/modules/file/src/Tests/FileFieldRevisionTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldRevisionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/file/src/Tests/FileFieldTestBase.php b/core/modules/file/tests/src/Functional/FileFieldTestBase.php
similarity index 98%
rename from core/modules/file/src/Tests/FileFieldTestBase.php
rename to core/modules/file/tests/src/Functional/FileFieldTestBase.php
index 307eb4d..d2f3bee 100644
--- a/core/modules/file/src/Tests/FileFieldTestBase.php
+++ b/core/modules/file/tests/src/Functional/FileFieldTestBase.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\file\FileInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\file\Entity\File;
 
 /**
  * Provides methods specifically for testing File module's field handling.
  */
-abstract class FileFieldTestBase extends WebTestBase {
+abstract class FileFieldTestBase extends BrowserTestBase {
 
   /**
   * Modules to enable.
diff --git a/core/modules/file/src/Tests/FileFieldValidateTest.php b/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileFieldValidateTest.php
rename to core/modules/file/tests/src/Functional/FileFieldValidateTest.php
index 9d43060..e1f4332 100644
--- a/core/modules/file/src/Tests/FileFieldValidateTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileFieldWidgetTest.php
rename to core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
index 414c86b..799d358 100644
--- a/core/modules/file/src/Tests/FileFieldWidgetTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\comment\Entity\Comment;
 use Drupal\comment\Tests\CommentTestTrait;
diff --git a/core/modules/file/src/Tests/FileListingTest.php b/core/modules/file/tests/src/Functional/FileListingTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileListingTest.php
rename to core/modules/file/tests/src/Functional/FileListingTest.php
index 708f138..a99af0e 100644
--- a/core/modules/file/src/Tests/FileListingTest.php
+++ b/core/modules/file/tests/src/Functional/FileListingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\node\Entity\Node;
 use Drupal\file\Entity\File;
diff --git a/core/modules/file/src/Tests/FileManagedAccessTest.php b/core/modules/file/tests/src/Functional/FileManagedAccessTest.php
similarity index 98%
rename from core/modules/file/src/Tests/FileManagedAccessTest.php
rename to core/modules/file/tests/src/Functional/FileManagedAccessTest.php
index 391f91a..97f77b6 100644
--- a/core/modules/file/src/Tests/FileManagedAccessTest.php
+++ b/core/modules/file/tests/src/Functional/FileManagedAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/file/src/Tests/FileManagedFileElementTest.php b/core/modules/file/tests/src/Functional/FileManagedFileElementTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileManagedFileElementTest.php
rename to core/modules/file/tests/src/Functional/FileManagedFileElementTest.php
index 07102a0..b75193f 100644
--- a/core/modules/file/src/Tests/FileManagedFileElementTest.php
+++ b/core/modules/file/tests/src/Functional/FileManagedFileElementTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 /**
  * Tests the 'managed_file' element type.
diff --git a/core/modules/file/src/Tests/FileManagedTestBase.php b/core/modules/file/tests/src/Functional/FileManagedTestBase.php
similarity index 98%
rename from core/modules/file/src/Tests/FileManagedTestBase.php
rename to core/modules/file/tests/src/Functional/FileManagedTestBase.php
index a6e94fa..6bd57dd 100644
--- a/core/modules/file/src/Tests/FileManagedTestBase.php
+++ b/core/modules/file/tests/src/Functional/FileManagedTestBase.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\file\Entity\File;
 use Drupal\file\FileInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Base class for file tests that use the file_test module to test uploads and
  * hooks.
  */
-abstract class FileManagedTestBase extends WebTestBase {
+abstract class FileManagedTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php b/core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
rename to core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php
index a7150e5..788257c 100644
--- a/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
+++ b/core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/file/src/Tests/FilePrivateTest.php b/core/modules/file/tests/src/Functional/FilePrivateTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FilePrivateTest.php
rename to core/modules/file/tests/src/Functional/FilePrivateTest.php
index 2705ef2..e77d72f 100644
--- a/core/modules/file/src/Tests/FilePrivateTest.php
+++ b/core/modules/file/tests/src/Functional/FilePrivateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\Core\Entity\Plugin\Validation\Constraint\ReferenceAccessConstraint;
 use Drupal\Component\Utility\SafeMarkup;
diff --git a/core/modules/file/src/Tests/FileTokenReplaceTest.php b/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php
similarity index 99%
rename from core/modules/file/src/Tests/FileTokenReplaceTest.php
rename to core/modules/file/tests/src/Functional/FileTokenReplaceTest.php
index dfb9e51..278fadb 100644
--- a/core/modules/file/src/Tests/FileTokenReplaceTest.php
+++ b/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Render\BubbleableMetadata;
diff --git a/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php b/core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php
similarity index 99%
rename from core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
rename to core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php
index 15039ed..74eb747 100644
--- a/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
+++ b/core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\file\Entity\File;
 use Drupal\node\Entity\Node;
diff --git a/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php b/core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php
similarity index 90%
rename from core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
rename to core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php
index b1ee6a6..284fbdf 100644
--- a/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
+++ b/core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 /**
  * Tests the file uploading functions.
diff --git a/core/modules/file/src/Tests/SaveUploadTest.php b/core/modules/file/tests/src/Functional/SaveUploadTest.php
similarity index 99%
rename from core/modules/file/src/Tests/SaveUploadTest.php
rename to core/modules/file/tests/src/Functional/SaveUploadTest.php
index 3aaa5cf..517990a 100644
--- a/core/modules/file/src/Tests/SaveUploadTest.php
+++ b/core/modules/file/tests/src/Functional/SaveUploadTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/filter/src/Tests/FilterAdminTest.php b/core/modules/filter/tests/src/Functional/FilterAdminTest.php
similarity index 99%
rename from core/modules/filter/src/Tests/FilterAdminTest.php
rename to core/modules/filter/tests/src/Functional/FilterAdminTest.php
index e71b57a..61346d7 100644
--- a/core/modules/filter/src/Tests/FilterAdminTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterAdminTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -15,7 +15,7 @@
  *
  * @group filter
  */
-class FilterAdminTest extends WebTestBase {
+class FilterAdminTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/filter/src/Tests/FilterCaptionTwigDebugTest.php b/core/modules/filter/tests/src/Functional/FilterCaptionTwigDebugTest.php
similarity index 95%
rename from core/modules/filter/src/Tests/FilterCaptionTwigDebugTest.php
rename to core/modules/filter/tests/src/Functional/FilterCaptionTwigDebugTest.php
index cd5e8e2..ef520c7 100644
--- a/core/modules/filter/src/Tests/FilterCaptionTwigDebugTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterCaptionTwigDebugTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\Core\Render\RenderContext;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\FilterPluginCollection;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group filter
  */
-class FilterCaptionTwigDebugTest extends WebTestBase {
+class FilterCaptionTwigDebugTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/filter/src/Tests/FilterDefaultFormatTest.php b/core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php
similarity index 95%
rename from core/modules/filter/src/Tests/FilterDefaultFormatTest.php
rename to core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php
index 39a6295..6014c10 100644
--- a/core/modules/filter/src/Tests/FilterDefaultFormatTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the default text formats for different users.
  *
  * @group filter
  */
-class FilterDefaultFormatTest extends WebTestBase {
+class FilterDefaultFormatTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/filter/src/Tests/FilterFormTest.php b/core/modules/filter/tests/src/Functional/FilterFormTest.php
similarity index 99%
rename from core/modules/filter/src/Tests/FilterFormTest.php
rename to core/modules/filter/tests/src/Functional/FilterFormTest.php
index 24bbc15..9a16f0f 100644
--- a/core/modules/filter/src/Tests/FilterFormTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterFormTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests form elements with associated text formats.
  *
  * @group filter
  */
-class FilterFormTest extends WebTestBase {
+class FilterFormTest extends BrowserTestBase {
 
   /**
    * Modules to enable for this test.
diff --git a/core/modules/filter/src/Tests/FilterHooksTest.php b/core/modules/filter/tests/src/Functional/FilterHooksTest.php
similarity index 95%
rename from core/modules/filter/src/Tests/FilterHooksTest.php
rename to core/modules/filter/tests/src/Functional/FilterHooksTest.php
index 5353ccb..c499f23 100644
--- a/core/modules/filter/src/Tests/FilterHooksTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterHooksTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group filter
  */
-class FilterHooksTest extends WebTestBase {
+class FilterHooksTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
similarity index 97%
rename from core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
rename to core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
index 5ce4e6d..c9f521e 100644
--- a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\StreamWrapper\PublicStream;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group filter
  */
-class FilterHtmlImageSecureTest extends WebTestBase {
+class FilterHtmlImageSecureTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/filter/src/Tests/FilterNoFormatTest.php b/core/modules/filter/tests/src/Functional/FilterNoFormatTest.php
similarity index 88%
rename from core/modules/filter/src/Tests/FilterNoFormatTest.php
rename to core/modules/filter/tests/src/Functional/FilterNoFormatTest.php
index 3dcc9f6..1139947 100644
--- a/core/modules/filter/src/Tests/FilterNoFormatTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterNoFormatTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the behavior of check_markup() when it is called without text format.
  *
  * @group filter
  */
-class FilterNoFormatTest extends WebTestBase {
+class FilterNoFormatTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/filter/src/Tests/FilterSecurityTest.php b/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
similarity index 96%
rename from core/modules/filter/src/Tests/FilterSecurityTest.php
rename to core/modules/filter/tests/src/Functional/FilterSecurityTest.php
index 12cd97a..4055159 100644
--- a/core/modules/filter/src/Tests/FilterSecurityTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Plugin\FilterInterface;
 use Drupal\user\RoleInterface;
 
@@ -14,7 +14,7 @@
  *
  * @group filter
  */
-class FilterSecurityTest extends WebTestBase {
+class FilterSecurityTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/forum/src/Tests/ForumBlockTest.php b/core/modules/forum/tests/src/Functional/ForumBlockTest.php
similarity index 97%
rename from core/modules/forum/src/Tests/ForumBlockTest.php
rename to core/modules/forum/tests/src/Functional/ForumBlockTest.php
index 1bcc9bc..2f67cd4 100644
--- a/core/modules/forum/src/Tests/ForumBlockTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumBlockTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\comment\Entity\Comment;
 
@@ -11,7 +11,7 @@
  *
  * @group forum
  */
-class ForumBlockTest extends WebTestBase {
+class ForumBlockTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/forum/src/Tests/ForumIndexTest.php b/core/modules/forum/tests/src/Functional/ForumIndexTest.php
similarity index 95%
rename from core/modules/forum/src/Tests/ForumIndexTest.php
rename to core/modules/forum/tests/src/Functional/ForumIndexTest.php
index 8ead34f..8bcb482 100644
--- a/core/modules/forum/src/Tests/ForumIndexTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumIndexTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the forum index listing.
  *
  * @group forum
  */
-class ForumIndexTest extends WebTestBase {
+class ForumIndexTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/forum/src/Tests/ForumNodeAccessTest.php b/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
similarity index 95%
rename from core/modules/forum/src/Tests/ForumNodeAccessTest.php
rename to core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
index 8eda252..59a1192 100644
--- a/core/modules/forum/src/Tests/ForumNodeAccessTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\node\Entity\NodeType;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group forum
  */
-class ForumNodeAccessTest extends WebTestBase {
+class ForumNodeAccessTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/tests/src/Functional/ForumTest.php
similarity index 99%
rename from core/modules/forum/src/Tests/ForumTest.php
rename to core/modules/forum/tests/src/Functional/ForumTest.php
index df21f69..8985d89 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Link;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Url;
 use Drupal\taxonomy\Entity\Vocabulary;
 
@@ -18,7 +18,7 @@
  *
  * @group forum
  */
-class ForumTest extends WebTestBase {
+class ForumTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/forum/src/Tests/ForumUninstallTest.php b/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
similarity index 97%
rename from core/modules/forum/src/Tests/ForumUninstallTest.php
rename to core/modules/forum/tests/src/Functional/ForumUninstallTest.php
index 1978e6b..8b13858 100644
--- a/core/modules/forum/src/Tests/ForumUninstallTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
 use Drupal\comment\CommentInterface;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\comment\Entity\Comment;
 use Drupal\taxonomy\Entity\Term;
 
@@ -14,7 +14,7 @@
  *
  * @group forum
  */
-class ForumUninstallTest extends WebTestBase {
+class ForumUninstallTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/hal/src/Tests/FileDenormalizeTest.php b/core/modules/hal/tests/src/Functional/FileDenormalizeTest.php
similarity index 95%
rename from core/modules/hal/src/Tests/FileDenormalizeTest.php
rename to core/modules/hal/tests/src/Functional/FileDenormalizeTest.php
index f160634..36f8762 100644
--- a/core/modules/hal/src/Tests/FileDenormalizeTest.php
+++ b/core/modules/hal/tests/src/Functional/FileDenormalizeTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\hal\Tests;
+namespace Drupal\Tests\hal\Functional;
 
 use Drupal\file\Entity\File;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that file entities can be denormalized in HAL.
@@ -11,7 +11,7 @@
  * @group hal
  * @see \Drupal\hal\Normalizer\FileEntityNormalizer
  */
-class FileDenormalizeTest extends WebTestBase {
+class FileDenormalizeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/history/src/Tests/HistoryTest.php b/core/modules/history/tests/src/Functional/HistoryTest.php
similarity index 97%
rename from core/modules/history/src/Tests/HistoryTest.php
rename to core/modules/history/tests/src/Functional/HistoryTest.php
index 17bba34..f89f147 100644
--- a/core/modules/history/src/Tests/HistoryTest.php
+++ b/core/modules/history/tests/src/Functional/HistoryTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\history\Tests;
+namespace Drupal\Tests\history\Functional;
 
 use Drupal\Component\Serialization\Json;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the History endpoints.
  *
  * @group history
  */
-class HistoryTest extends WebTestBase {
+class HistoryTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/src/Tests/FileMoveTest.php b/core/modules/image/tests/src/Functional/FileMoveTest.php
similarity index 92%
rename from core/modules/image/src/Tests/FileMoveTest.php
rename to core/modules/image/tests/src/Functional/FileMoveTest.php
index 1957994..3ac543e 100644
--- a/core/modules/image/src/Tests/FileMoveTest.php
+++ b/core/modules/image/tests/src/Functional/FileMoveTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\file\Entity\File;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\image\Entity\ImageStyle;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group image
  */
-class FileMoveTest extends WebTestBase {
+class FileMoveTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
similarity index 99%
rename from core/modules/image/src/Tests/ImageAdminStylesTest.php
rename to core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
index 4b7ff43..832a988 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
diff --git a/core/modules/image/src/Tests/ImageDimensionsTest.php b/core/modules/image/tests/src/Functional/ImageDimensionsTest.php
similarity index 98%
rename from core/modules/image/src/Tests/ImageDimensionsTest.php
rename to core/modules/image/tests/src/Functional/ImageDimensionsTest.php
index 6f73042..8d3b369 100644
--- a/core/modules/image/src/Tests/ImageDimensionsTest.php
+++ b/core/modules/image/tests/src/Functional/ImageDimensionsTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\image\Entity\ImageStyle;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that images have correct dimensions when styled.
  *
  * @group image
  */
-class ImageDimensionsTest extends WebTestBase {
+class ImageDimensionsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/src/Tests/ImageEffectsTest.php b/core/modules/image/tests/src/Functional/ImageEffectsTest.php
similarity index 99%
rename from core/modules/image/src/Tests/ImageEffectsTest.php
rename to core/modules/image/tests/src/Functional/ImageEffectsTest.php
index 895457f..17c343b 100644
--- a/core/modules/image/src/Tests/ImageEffectsTest.php
+++ b/core/modules/image/tests/src/Functional/ImageEffectsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\image\Entity\ImageStyle;
 use Drupal\system\Tests\Image\ToolkitTestBase;
diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/tests/src/Functional/ImageFieldDefaultImagesTest.php
similarity index 99%
rename from core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
rename to core/modules/image/tests/src/Functional/ImageFieldDefaultImagesTest.php
index a0f0274..c69746b 100644
--- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldDefaultImagesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
similarity index 99%
rename from core/modules/image/src/Tests/ImageFieldDisplayTest.php
rename to core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
index 666a791..ef1bab5 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/image/src/Tests/ImageFieldTestBase.php b/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
similarity index 97%
rename from core/modules/image/src/Tests/ImageFieldTestBase.php
rename to core/modules/image/tests/src/Functional/ImageFieldTestBase.php
index 6081d32..df68dd9 100644
--- a/core/modules/image/src/Tests/ImageFieldTestBase.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -22,7 +22,7 @@
 /**
  * This class provides methods specifically for testing Image's field handling.
  */
-abstract class ImageFieldTestBase extends WebTestBase {
+abstract class ImageFieldTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/src/Tests/ImageFieldValidateTest.php b/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
similarity index 99%
rename from core/modules/image/src/Tests/ImageFieldValidateTest.php
rename to core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
index 5f0bf21..b2ada06 100644
--- a/core/modules/image/src/Tests/ImageFieldValidateTest.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 /**
  * Tests validation functions such as min/max resolution.
diff --git a/core/modules/image/src/Tests/ImageFieldWidgetTest.php b/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
similarity index 95%
rename from core/modules/image/src/Tests/ImageFieldWidgetTest.php
rename to core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
index 52d9e4d..f8f9601 100644
--- a/core/modules/image/src/Tests/ImageFieldWidgetTest.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 /**
  * Tests the image field widget.
diff --git a/core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php b/core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php
similarity index 99%
rename from core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
rename to core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php
index e716d28..a78920b 100644
--- a/core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
+++ b/core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/image/src/Tests/ImageStyleDeleteTest.php b/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
similarity index 99%
rename from core/modules/image/src/Tests/ImageStyleDeleteTest.php
rename to core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
index feb06ce..fff2760 100644
--- a/core/modules/image/src/Tests/ImageStyleDeleteTest.php
+++ b/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
diff --git a/core/modules/image/src/Tests/ImageStyleFlushTest.php b/core/modules/image/tests/src/Functional/ImageStyleFlushTest.php
similarity index 98%
rename from core/modules/image/src/Tests/ImageStyleFlushTest.php
rename to core/modules/image/tests/src/Functional/ImageStyleFlushTest.php
index 63c0d80..316f67d 100644
--- a/core/modules/image/src/Tests/ImageStyleFlushTest.php
+++ b/core/modules/image/tests/src/Functional/ImageStyleFlushTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\image\Entity\ImageStyle;
 
diff --git a/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php b/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
similarity index 99%
rename from core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
rename to core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
index d03bc3b..cfade75 100644
--- a/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
+++ b/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\image\Entity\ImageStyle;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the functions for generating paths and URLs for image styles.
  *
  * @group image
  */
-class ImageStylesPathAndUrlTest extends WebTestBase {
+class ImageStylesPathAndUrlTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/src/Tests/ImageThemeFunctionTest.php b/core/modules/image/tests/src/Functional/ImageThemeFunctionTest.php
similarity index 98%
rename from core/modules/image/src/Tests/ImageThemeFunctionTest.php
rename to core/modules/image/tests/src/Functional/ImageThemeFunctionTest.php
index 52cf6c6..f276d0d 100644
--- a/core/modules/image/src/Tests/ImageThemeFunctionTest.php
+++ b/core/modules/image/tests/src/Functional/ImageThemeFunctionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Url;
@@ -8,7 +8,7 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\file\Entity\File;
 use Drupal\image\Entity\ImageStyle;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -16,7 +16,7 @@
  *
  * @group image
  */
-class ImageThemeFunctionTest extends WebTestBase {
+class ImageThemeFunctionTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php b/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
similarity index 89%
rename from core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php
rename to core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
index 3cc00f9..bd46a40 100644
--- a/core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php
+++ b/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test administration path based conversion of entities.
  *
  * @group language
  */
-class AdminPathEntityConverterLanguageTest extends WebTestBase {
+class AdminPathEntityConverterLanguageTest extends BrowserTestBase {
 
   public static $modules = array('language', 'language_test');
 
diff --git a/core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php b/core/modules/language/tests/src/Functional/EntityTypeWithoutLanguageFormTest.php
similarity index 87%
rename from core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php
rename to core/modules/language/tests/src/Functional/EntityTypeWithoutLanguageFormTest.php
index 20a3532..14d5473 100644
--- a/core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php
+++ b/core/modules/language/tests/src/Functional/EntityTypeWithoutLanguageFormTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests entity type without language support.
@@ -12,7 +12,7 @@
  *
  * @group language
  */
-class EntityTypeWithoutLanguageFormTest extends WebTestBase {
+class EntityTypeWithoutLanguageFormTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php b/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php
similarity index 89%
rename from core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
rename to core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php
index ee6912e..3090d5b 100644
--- a/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that the language settings on block config appears correctly.
  *
  * @group language
  */
-class LanguageBlockSettingsVisibilityTest extends WebTestBase {
+class LanguageBlockSettingsVisibilityTest extends BrowserTestBase {
 
   public static $modules = array('block', 'language');
 
diff --git a/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php b/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
similarity index 96%
rename from core/modules/language/src/Tests/LanguageBrowserDetectionTest.php
rename to core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
index 3991b2a..1b1382a 100644
--- a/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests browser language detection.
  *
  * @group language
  */
-class LanguageBrowserDetectionTest extends WebTestBase {
+class LanguageBrowserDetectionTest extends BrowserTestBase {
 
   public static $modules = array('language');
 
diff --git a/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php b/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php
similarity index 96%
rename from core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php
rename to core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php
index 182c3fe..76d97fb 100644
--- a/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Ensures the language config overrides can be synchronized.
  *
  * @group language
  */
-class LanguageConfigOverrideImportTest extends WebTestBase {
+class LanguageConfigOverrideImportTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageConfigSchemaTest.php b/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php
similarity index 93%
rename from core/modules/language/src/Tests/LanguageConfigSchemaTest.php
rename to core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php
index 97cbbb7..2ea76d8 100644
--- a/core/modules/language/src/Tests/LanguageConfigSchemaTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Ensures the language config schema is correct.
  *
  * @group language
  */
-class LanguageConfigSchemaTest extends WebTestBase {
+class LanguageConfigSchemaTest extends BrowserTestBase {
 
   use SchemaCheckTestTrait;
 
diff --git a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php b/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
similarity index 98%
rename from core/modules/language/src/Tests/LanguageConfigurationElementTest.php
rename to core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
index 93b821d..10d0bfa 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\language\Entity\ContentLanguageSettings;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @group language
  */
-class LanguageConfigurationElementTest extends WebTestBase {
+class LanguageConfigurationElementTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageConfigurationTest.php b/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
similarity index 98%
rename from core/modules/language/src/Tests/LanguageConfigurationTest.php
rename to core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
index cf049f1..97592d2 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Adds and configures languages to check negotiation changes.
  *
  * @group language
  */
-class LanguageConfigurationTest extends WebTestBase {
+class LanguageConfigurationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php
similarity index 96%
rename from core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php
rename to core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php
index dbd35cd..6c01c00 100644
--- a/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
 
@@ -11,7 +11,7 @@
  *
  * @group language
  */
-class LanguageCustomLanguageConfigurationTest extends WebTestBase {
+class LanguageCustomLanguageConfigurationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageListModuleInstallTest.php b/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
similarity index 89%
rename from core/modules/language/src/Tests/LanguageListModuleInstallTest.php
rename to core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
index 3df9bdc..2b5ad7e 100644
--- a/core/modules/language/src/Tests/LanguageListModuleInstallTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests enabling Language if a module exists that calls
@@ -10,7 +10,7 @@
  *
  * @group language
  */
-class LanguageListModuleInstallTest extends WebTestBase {
+class LanguageListModuleInstallTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageListTest.php b/core/modules/language/tests/src/Functional/LanguageListTest.php
similarity index 98%
rename from core/modules/language/src/Tests/LanguageListTest.php
rename to core/modules/language/tests/src/Functional/LanguageListTest.php
index d407530..bdbda9e 100644
--- a/core/modules/language/src/Tests/LanguageListTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageListTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
 
@@ -12,7 +12,7 @@
  *
  * @group language
  */
-class LanguageListTest extends WebTestBase {
+class LanguageListTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageLocaleListTest.php b/core/modules/language/tests/src/Functional/LanguageLocaleListTest.php
similarity index 93%
rename from core/modules/language/src/Tests/LanguageLocaleListTest.php
rename to core/modules/language/tests/src/Functional/LanguageLocaleListTest.php
index dd3e02a..6919c26 100644
--- a/core/modules/language/src/Tests/LanguageLocaleListTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageLocaleListTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Adds a new language with translations and tests language list order.
  *
  * @group language
  */
-class LanguageLocaleListTest extends WebTestBase {
+class LanguageLocaleListTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageNegotiationContentEntityTest.php b/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php
similarity index 98%
rename from core/modules/language/src/Tests/LanguageNegotiationContentEntityTest.php
rename to core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php
index ba0a4db..8991437 100644
--- a/core/modules/language/src/Tests/LanguageNegotiationContentEntityTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Language\LanguageInterface;
@@ -8,7 +8,7 @@
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
@@ -18,7 +18,7 @@
  *
  * @group language
  */
-class LanguageNegotiationContentEntityTest extends WebTestBase {
+class LanguageNegotiationContentEntityTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php b/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
similarity index 98%
rename from core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
rename to core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
index ee4c6d4..4c274e5 100644
--- a/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests alterations to language types/negotiation info.
  *
  * @group language
  */
-class LanguageNegotiationInfoTest extends WebTestBase {
+class LanguageNegotiationInfoTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguagePathMonolingualTest.php b/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
similarity index 94%
rename from core/modules/language/src/Tests/LanguagePathMonolingualTest.php
rename to core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
index 510d805..681b378 100644
--- a/core/modules/language/src/Tests/LanguagePathMonolingualTest.php
+++ b/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Confirm that paths are not changed on monolingual non-English sites.
  *
  * @group language
  */
-class LanguagePathMonolingualTest extends WebTestBase {
+class LanguagePathMonolingualTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php b/core/modules/language/tests/src/Functional/LanguageSelectorTranslatableTest.php
similarity index 93%
rename from core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php
rename to core/modules/language/tests/src/Functional/LanguageSelectorTranslatableTest.php
index 84d6779..dd8894e 100644
--- a/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageSelectorTranslatableTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the content translation settings language selector options.
  *
  * @group language
  */
-class LanguageSelectorTranslatableTest extends WebTestBase {
+class LanguageSelectorTranslatableTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageSwitchingTest.php b/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
similarity index 99%
rename from core/modules/language/src/Tests/LanguageSwitchingTest.php
rename to core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
index c076e6f..11adb12 100644
--- a/core/modules/language/src/Tests/LanguageSwitchingTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Functional tests for the language switching feature.
  *
  * @group language
  */
-class LanguageSwitchingTest extends WebTestBase {
+class LanguageSwitchingTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageTourTest.php b/core/modules/language/tests/src/Functional/LanguageTourTest.php
similarity index 96%
rename from core/modules/language/src/Tests/LanguageTourTest.php
rename to core/modules/language/tests/src/Functional/LanguageTourTest.php
index 7778367..31c1ce2 100644
--- a/core/modules/language/src/Tests/LanguageTourTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageTourTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\tour\Tests\TourTestBase;
 
diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
similarity index 99%
rename from core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
rename to core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
index ef2abee..79f75d2 100644
--- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\Core\Url;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -10,7 +10,7 @@
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
 use Drupal\user\Plugin\LanguageNegotiation\LanguageNegotiationUser;
 use Drupal\user\Plugin\LanguageNegotiation\LanguageNegotiationUserAdmin;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -37,7 +37,7 @@
  *
  * @group language
  */
-class LanguageUILanguageNegotiationTest extends WebTestBase {
+class LanguageUILanguageNegotiationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/src/Tests/LanguageUrlRewritingTest.php b/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
similarity index 97%
rename from core/modules/language/src/Tests/LanguageUrlRewritingTest.php
rename to core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
index 5cd80dc..9cd6a60 100644
--- a/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Url;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -14,7 +14,7 @@
  *
  * @group language
  */
-class LanguageUrlRewritingTest extends WebTestBase {
+class LanguageUrlRewritingTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/link/src/Tests/LinkFieldTest.php b/core/modules/link/tests/src/Functional/LinkFieldTest.php
similarity index 99%
rename from core/modules/link/src/Tests/LinkFieldTest.php
rename to core/modules/link/tests/src/Functional/LinkFieldTest.php
index e85ad53..af728ff 100644
--- a/core/modules/link/src/Tests/LinkFieldTest.php
+++ b/core/modules/link/tests/src/Functional/LinkFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\link\Tests;
+namespace Drupal\Tests\link\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
@@ -8,7 +8,7 @@
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\link\LinkItemInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -16,7 +16,7 @@
  *
  * @group link
  */
-class LinkFieldTest extends WebTestBase {
+class LinkFieldTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/link/src/Tests/LinkFieldUITest.php b/core/modules/link/tests/src/Functional/LinkFieldUITest.php
similarity index 96%
rename from core/modules/link/src/Tests/LinkFieldUITest.php
rename to core/modules/link/tests/src/Functional/LinkFieldUITest.php
index 855c10b..eeed78c 100644
--- a/core/modules/link/src/Tests/LinkFieldUITest.php
+++ b/core/modules/link/tests/src/Functional/LinkFieldUITest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\link\Tests;
+namespace Drupal\Tests\link\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
 use Drupal\link\LinkItemInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests link field UI functionality.
  *
  * @group link
  */
-class LinkFieldUITest extends WebTestBase {
+class LinkFieldUITest extends BrowserTestBase {
 
   use FieldUiTestTrait;
 
diff --git a/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php b/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php
similarity index 98%
rename from core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php
rename to core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php
index 67faa81..0fd7561 100644
--- a/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\locale\Locale;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group locale
  */
-class LocaleConfigTranslationImportTest extends WebTestBase {
+class LocaleConfigTranslationImportTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php b/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php
similarity index 98%
rename from core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
rename to core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php
index 3ee988a..f0764a1 100644
--- a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Language\LanguageInterface;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group locale
  */
-class LocaleConfigTranslationTest extends WebTestBase {
+class LocaleConfigTranslationTest extends BrowserTestBase {
 
   /**
    * The language code used.
diff --git a/core/modules/locale/src/Tests/LocaleContentTest.php b/core/modules/locale/tests/src/Functional/LocaleContentTest.php
similarity index 98%
rename from core/modules/locale/src/Tests/LocaleContentTest.php
rename to core/modules/locale/tests/src/Functional/LocaleContentTest.php
index 188b574..2350d9d 100644
--- a/core/modules/locale/src/Tests/LocaleContentTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleContentTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Language\LanguageInterface;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group locale
  */
-class LocaleContentTest extends WebTestBase {
+class LocaleContentTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocaleExportTest.php b/core/modules/locale/tests/src/Functional/LocaleExportTest.php
similarity index 97%
rename from core/modules/locale/src/Tests/LocaleExportTest.php
rename to core/modules/locale/tests/src/Functional/LocaleExportTest.php
index 3d861de..a61d1ea 100644
--- a/core/modules/locale/src/Tests/LocaleExportTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleExportTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the exportation of locale files.
  *
  * @group locale
  */
-class LocaleExportTest extends WebTestBase {
+class LocaleExportTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php b/core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php
similarity index 91%
rename from core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
rename to core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php
index 1e41755..70d4976 100644
--- a/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the locale functionality in the altered file settings form.
  *
  * @group locale
  */
-class LocaleFileSystemFormTest extends WebTestBase {
+class LocaleFileSystemFormTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
similarity index 99%
rename from core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
rename to core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
index 0b69da2..2fb1d0b 100644
--- a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Language\LanguageInterface;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group locale
  */
-class LocaleImportFunctionalTest extends WebTestBase {
+class LocaleImportFunctionalTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php b/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
similarity index 97%
rename from core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
rename to core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
index b16ba18..85c210b 100644
--- a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Component\Utility\SafeMarkup;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group locale
  */
-class LocaleJavascriptTranslationTest extends WebTestBase {
+class LocaleJavascriptTranslationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php b/core/modules/locale/tests/src/Functional/LocaleLibraryAlterTest.php
similarity index 85%
rename from core/modules/locale/src/Tests/LocaleLibraryAlterTest.php
rename to core/modules/locale/tests/src/Functional/LocaleLibraryAlterTest.php
index e84e3dd..ff480e2 100644
--- a/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleLibraryAlterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\Core\Asset\AttachedAssets;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests localization of the JavaScript libraries.
@@ -12,7 +12,7 @@
  *
  * @group locale
  */
-class LocaleLibraryAlterTest extends WebTestBase {
+class LocaleLibraryAlterTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocaleLocaleLookupTest.php b/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php
similarity index 92%
rename from core/modules/locale/src/Tests/LocaleLocaleLookupTest.php
rename to core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php
index ea4f937..33600dd 100644
--- a/core/modules/locale/src/Tests/LocaleLocaleLookupTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests LocaleLookup.
  *
  * @group locale
  */
-class LocaleLocaleLookupTest extends WebTestBase {
+class LocaleLocaleLookupTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocalePathTest.php b/core/modules/locale/tests/src/Functional/LocalePathTest.php
similarity index 97%
rename from core/modules/locale/src/Tests/LocalePathTest.php
rename to core/modules/locale/tests/src/Functional/LocalePathTest.php
index cc4f31a..fd26320 100644
--- a/core/modules/locale/src/Tests/LocalePathTest.php
+++ b/core/modules/locale/tests/src/Functional/LocalePathTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests you can configure a language for individual URL aliases.
  *
  * @group locale
  */
-class LocalePathTest extends WebTestBase {
+class LocalePathTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocalePluralFormatTest.php b/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
similarity index 99%
rename from core/modules/locale/src/Tests/LocalePluralFormatTest.php
rename to core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
index 00fe8d5..09f6cd2 100644
--- a/core/modules/locale/src/Tests/LocalePluralFormatTest.php
+++ b/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests plural handling for various languages.
  *
  * @group locale
  */
-class LocalePluralFormatTest extends WebTestBase {
+class LocalePluralFormatTest extends BrowserTestBase {
 
   /**
    * An admin user.
diff --git a/core/modules/locale/src/Tests/LocaleStringTest.php b/core/modules/locale/tests/src/Functional/LocaleStringTest.php
similarity index 98%
rename from core/modules/locale/src/Tests/LocaleStringTest.php
rename to core/modules/locale/tests/src/Functional/LocaleStringTest.php
index 2f467e7..082515f 100644
--- a/core/modules/locale/src/Tests/LocaleStringTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleStringTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the locale string storage, string objects and data API.
  *
  * @group locale
  */
-class LocaleStringTest extends WebTestBase {
+class LocaleStringTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php b/core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php
similarity index 96%
rename from core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php
rename to core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php
index 5c642f2..8430ba1 100644
--- a/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleTranslateStringTourTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\tour\Tests\TourTestBase;
 
diff --git a/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php b/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
similarity index 95%
rename from core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
rename to core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
index b117e2c..4b1eb0a 100644
--- a/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Adds and configures languages to check field schema definition.
  *
  * @group locale
  */
-class LocaleTranslatedSchemaDefinitionTest extends WebTestBase {
+class LocaleTranslatedSchemaDefinitionTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php b/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
similarity index 99%
rename from core/modules/locale/src/Tests/LocaleTranslationUiTest.php
rename to core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
index aad0119..297b403 100644
--- a/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Component\Utility\SafeMarkup;
 
@@ -13,7 +13,7 @@
  *
  * @group locale
  */
-class LocaleTranslationUiTest extends WebTestBase {
+class LocaleTranslationUiTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/menu_link_content/src/Tests/LinksTest.php b/core/modules/menu_link_content/tests/src/Functional/LinksTest.php
similarity index 98%
rename from core/modules/menu_link_content/src/Tests/LinksTest.php
rename to core/modules/menu_link_content/tests/src/Functional/LinksTest.php
index 84fecde..9047ac8 100644
--- a/core/modules/menu_link_content/src/Tests/LinksTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/LinksTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\menu_link_content\Tests;
+namespace Drupal\Tests\menu_link_content\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Entity\Menu;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group Menu
  */
-class LinksTest extends WebTestBase {
+class LinksTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
similarity index 91%
rename from core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
rename to core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
index e6ec76e..6a51fd2 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\menu_link_content\Tests;
+namespace Drupal\Tests\menu_link_content\Functional;
 
 use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Entity\Menu;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group Menu
  */
-class MenuLinkContentDeleteFormTest extends WebTestBase {
+class MenuLinkContentDeleteFormTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
similarity index 91%
rename from core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
rename to core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
index 1bdc927..0b992cf 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\menu_link_content\Tests;
+namespace Drupal\Tests\menu_link_content\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the menu link content UI.
  *
  * @group Menu
  */
-class MenuLinkContentFormTest extends WebTestBase {
+class MenuLinkContentFormTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
similarity index 98%
rename from core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php
rename to core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
index cf802b7..a5c7c4e 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\menu_link_content\Tests;
+namespace Drupal\Tests\menu_link_content\Functional;
 
 use Drupal\content_translation\Tests\ContentTranslationUITestBase;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
diff --git a/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php b/core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php
similarity index 98%
rename from core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
rename to core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php
index 3ad4ad1..4e7833d 100644
--- a/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
 use Drupal\Core\Url;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
diff --git a/core/modules/menu_ui/src/Tests/MenuLanguageTest.php b/core/modules/menu_ui/tests/src/Functional/MenuLanguageTest.php
similarity index 99%
rename from core/modules/menu_ui/src/Tests/MenuLanguageTest.php
rename to core/modules/menu_ui/tests/src/Functional/MenuLanguageTest.php
index 72865ea..9aa3c42 100644
--- a/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\language\Entity\ConfigurableLanguage;
diff --git a/core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php b/core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php
similarity index 92%
rename from core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php
rename to core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php
index 0396f17..e0f7cc8 100644
--- a/core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Reorder menu items.
  *
  * @group menu_ui
  */
-class MenuLinkReorderTest extends WebTestBase {
+class MenuLinkReorderTest extends BrowserTestBase {
 
   /**
    * An administrator user.
diff --git a/core/modules/menu_ui/src/Tests/MenuNodeTest.php b/core/modules/menu_ui/tests/src/Functional/MenuNodeTest.php
similarity index 99%
rename from core/modules/menu_ui/src/Tests/MenuNodeTest.php
rename to core/modules/menu_ui/tests/src/Functional/MenuNodeTest.php
index 3fc8423..f89d142 100644
--- a/core/modules/menu_ui/src/Tests/MenuNodeTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuNodeTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\node\Entity\Node;
@@ -12,7 +12,7 @@
  *
  * @group menu_ui
  */
-class MenuNodeTest extends WebTestBase {
+class MenuNodeTest extends BrowserTestBase {
 
   /**
    * An editor user.
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/tests/src/Functional/MenuTest.php
similarity index 99%
rename from core/modules/menu_ui/src/Tests/MenuTest.php
rename to core/modules/menu_ui/tests/src/Functional/MenuTest.php
index e9464ab..b65c5df 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
 use Drupal\block\Entity\Block;
 use Drupal\Component\Serialization\Json;
diff --git a/core/modules/menu_ui/src/Tests/MenuUninstallTest.php b/core/modules/menu_ui/tests/src/Functional/MenuUninstallTest.php
similarity index 82%
rename from core/modules/menu_ui/src/Tests/MenuUninstallTest.php
rename to core/modules/menu_ui/tests/src/Functional/MenuUninstallTest.php
index b1ea03c..269454e 100644
--- a/core/modules/menu_ui/src/Tests/MenuUninstallTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuUninstallTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Entity\Menu;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group menu_ui
  */
-class MenuUninstallTest extends WebTestBase {
+class MenuUninstallTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/menu_ui/src/Tests/MenuWebTestBase.php b/core/modules/menu_ui/tests/src/Functional/MenuWebTestBase.php
similarity index 94%
rename from core/modules/menu_ui/src/Tests/MenuWebTestBase.php
rename to core/modules/menu_ui/tests/src/Functional/MenuWebTestBase.php
index c08fc14..e25038d 100644
--- a/core/modules/menu_ui/src/Tests/MenuWebTestBase.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuWebTestBase.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Base class for menu web tests.
  */
-abstract class MenuWebTestBase extends WebTestBase {
+abstract class MenuWebTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/migrate_drupal/src/Tests/StubTestTrait.php b/core/modules/migrate_drupal/tests/src/Functional/StubTestTrait.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/StubTestTrait.php
rename to core/modules/migrate_drupal/tests/src/Functional/StubTestTrait.php
index 3bf0028..661427f 100644
--- a/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
+++ b/core/modules/migrate_drupal/tests/src/Functional/StubTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\migrate_drupal\Tests;
+namespace Drupal\Tests\migrate_drupal\Functional;
 
 use Drupal\migrate\Row;
 
diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php
similarity index 82%
rename from core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
rename to core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php
index 2401d86..f4d7d05 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\migrate_drupal_ui\Tests;
+namespace Drupal\Tests\migrate_drupal_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that only user 1 can access the migrate UI.
  *
  * @group migrate_drupal_ui
  */
-class MigrateAccessTest extends WebTestBase {
+class MigrateAccessTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
similarity index 97%
rename from core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
rename to core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
index c139291..3bde344 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\migrate_drupal_ui\Tests;
+namespace Drupal\Tests\migrate_drupal_ui\Functional;
 
 use Drupal\Core\Database\Database;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate_drupal\MigrationConfigurationTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Provides a base class for testing migration upgrades in the UI.
  */
-abstract class MigrateUpgradeTestBase extends WebTestBase {
+abstract class MigrateUpgradeTestBase extends BrowserTestBase {
   use MigrationConfigurationTrait;
 
   /**
diff --git a/core/modules/node/src/Tests/AssertButtonsTrait.php b/core/modules/node/tests/src/Functional/AssertButtonsTrait.php
similarity index 97%
rename from core/modules/node/src/Tests/AssertButtonsTrait.php
rename to core/modules/node/tests/src/Functional/AssertButtonsTrait.php
index 58d484d..3f3c87f 100644
--- a/core/modules/node/src/Tests/AssertButtonsTrait.php
+++ b/core/modules/node/tests/src/Functional/AssertButtonsTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Asserts that buttons are present on a page.
diff --git a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
similarity index 97%
rename from core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
rename to core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
index c23986a..36ac519 100644
--- a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
+++ b/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/node/src/Tests/NodeAccessAutoBubblingTest.php b/core/modules/node/tests/src/Functional/NodeAccessAutoBubblingTest.php
similarity index 97%
rename from core/modules/node/src/Tests/NodeAccessAutoBubblingTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessAutoBubblingTest.php
index 789818b..bc80e15 100644
--- a/core/modules/node/src/Tests/NodeAccessAutoBubblingTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessAutoBubblingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Url;
 
diff --git a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php b/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeAccessBaseTableTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
index 74e2340..79cfb0b 100644
--- a/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\NodeType;
 
diff --git a/core/modules/node/src/Tests/NodeAccessFieldTest.php b/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
similarity index 98%
rename from core/modules/node/src/Tests/NodeAccessFieldTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
index dcfa43d..a84b7b6 100644
--- a/core/modules/node/src/Tests/NodeAccessFieldTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php b/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
index 5932108..7963e87 100644
--- a/core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests the node access grants cache context service.
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php
index 1ee5bc2..860bebe 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php b/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessLanguageAwareTest.php
index 0609b7b..90e040b 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageTest.php b/core/modules/node/tests/src/Functional/NodeAccessLanguageTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeAccessLanguageTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessLanguageTest.php
index e0393a0..e758676 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
diff --git a/core/modules/node/src/Tests/NodeAccessMenuLinkTest.php b/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
similarity index 97%
rename from core/modules/node/src/Tests/NodeAccessMenuLinkTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
index c1bc0eb..9d12098 100644
--- a/core/modules/node/src/Tests/NodeAccessMenuLinkTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\user\RoleInterface;
 
diff --git a/core/modules/node/src/Tests/NodeAccessPagerTest.php b/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
similarity index 95%
rename from core/modules/node/src/Tests/NodeAccessPagerTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
index 7db264c..e3e4dfa 100644
--- a/core/modules/node/src/Tests/NodeAccessPagerTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\comment\Entity\Comment;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group node
  */
-class NodeAccessPagerTest extends WebTestBase {
+class NodeAccessPagerTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php b/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php
index d151aad..2e37bf1 100644
--- a/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\NodeType;
 
diff --git a/core/modules/node/src/Tests/NodeAccessRecordsTest.php b/core/modules/node/tests/src/Functional/NodeAccessRecordsTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeAccessRecordsTest.php
rename to core/modules/node/tests/src/Functional/NodeAccessRecordsTest.php
index 4126539..ce16bee 100644
--- a/core/modules/node/src/Tests/NodeAccessRecordsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessRecordsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\Node;
 
diff --git a/core/modules/node/src/Tests/NodeActionsConfigurationTest.php b/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
similarity index 96%
rename from core/modules/node/src/Tests/NodeActionsConfigurationTest.php
rename to core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
index 7a732c6..fbfda8f 100644
--- a/core/modules/node/src/Tests/NodeActionsConfigurationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Component\Utility\Crypt;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Entity\Action;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group node
  */
-class NodeActionsConfigurationTest extends WebTestBase {
+class NodeActionsConfigurationTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/node/src/Tests/NodeAdminTest.php b/core/modules/node/tests/src/Functional/NodeAdminTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeAdminTest.php
rename to core/modules/node/tests/src/Functional/NodeAdminTest.php
index 1717bb1..cb01a87 100644
--- a/core/modules/node/src/Tests/NodeAdminTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAdminTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\user\RoleInterface;
 
diff --git a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php b/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeBlockFunctionalTest.php
rename to core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php
index 9579045..89f59b7 100644
--- a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
+++ b/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\block\Entity\Block;
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
diff --git a/core/modules/node/src/Tests/NodeCacheTagsTest.php b/core/modules/node/tests/src/Functional/NodeCacheTagsTest.php
similarity index 97%
rename from core/modules/node/src/Tests/NodeCacheTagsTest.php
rename to core/modules/node/tests/src/Functional/NodeCacheTagsTest.php
index 66932cc..d0007a1 100644
--- a/core/modules/node/src/Tests/NodeCacheTagsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\node\Entity\Node;
diff --git a/core/modules/node/src/Tests/NodeCreationTest.php b/core/modules/node/tests/src/Functional/NodeCreationTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeCreationTest.php
rename to core/modules/node/tests/src/Functional/NodeCreationTest.php
index bf3ce86..cf87a7c 100644
--- a/core/modules/node/src/Tests/NodeCreationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeCreationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Language\LanguageInterface;
diff --git a/core/modules/node/src/Tests/NodeEditFormTest.php b/core/modules/node/tests/src/Functional/NodeEditFormTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeEditFormTest.php
rename to core/modules/node/tests/src/Functional/NodeEditFormTest.php
index b154ca0..cc12dbc 100644
--- a/core/modules/node/src/Tests/NodeEditFormTest.php
+++ b/core/modules/node/tests/src/Functional/NodeEditFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\NodeInterface;
 use Drupal\user\Entity\User;
diff --git a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php b/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php
similarity index 97%
rename from core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
rename to core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php
index 25ae6b6..003e58c 100644
--- a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
+++ b/core/modules/node/tests/src/Functional/NodeEntityViewModeAlterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Cache\Cache;
 
diff --git a/core/modules/node/src/Tests/NodeFieldMultilingualTest.php b/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
similarity index 97%
rename from core/modules/node/src/Tests/NodeFieldMultilingualTest.php
rename to core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
index 3bd1a51..4359d09 100644
--- a/core/modules/node/src/Tests/NodeFieldMultilingualTest.php
+++ b/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Language\LanguageInterface;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @group node
  */
-class NodeFieldMultilingualTest extends WebTestBase {
+class NodeFieldMultilingualTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/node/src/Tests/NodeFormButtonsTest.php b/core/modules/node/tests/src/Functional/NodeFormButtonsTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeFormButtonsTest.php
rename to core/modules/node/tests/src/Functional/NodeFormButtonsTest.php
index 9f6732b..d624014 100644
--- a/core/modules/node/src/Tests/NodeFormButtonsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeFormButtonsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests all the different buttons on the node form.
diff --git a/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php b/core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php
similarity index 93%
rename from core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php
rename to core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php
index 36c1ccc..918a2e7 100644
--- a/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php
+++ b/core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests updating the changed time after API and FORM entity save.
  *
  * @group node
  */
-class NodeFormSaveChangedTimeTest extends WebTestBase {
+class NodeFormSaveChangedTimeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/node/src/Tests/NodeHelpTest.php b/core/modules/node/tests/src/Functional/NodeHelpTest.php
similarity index 92%
rename from core/modules/node/src/Tests/NodeHelpTest.php
rename to core/modules/node/tests/src/Functional/NodeHelpTest.php
index 2946011..ffeee08 100644
--- a/core/modules/node/src/Tests/NodeHelpTest.php
+++ b/core/modules/node/tests/src/Functional/NodeHelpTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests help functionality for nodes.
  *
  * @group node
  */
-class NodeHelpTest extends WebTestBase {
+class NodeHelpTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/node/src/Tests/NodeLinksTest.php b/core/modules/node/tests/src/Functional/NodeLinksTest.php
similarity index 95%
rename from core/modules/node/src/Tests/NodeLinksTest.php
rename to core/modules/node/tests/src/Functional/NodeLinksTest.php
index 72990c0..7eed934 100644
--- a/core/modules/node/src/Tests/NodeLinksTest.php
+++ b/core/modules/node/tests/src/Functional/NodeLinksTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests the output of node links (read more, add new comment, etc).
diff --git a/core/modules/node/src/Tests/NodeLoadMultipleTest.php b/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
similarity index 98%
rename from core/modules/node/src/Tests/NodeLoadMultipleTest.php
rename to core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
index 4add3bd..92440ca 100644
--- a/core/modules/node/src/Tests/NodeLoadMultipleTest.php
+++ b/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\Node;
 
diff --git a/core/modules/node/src/Tests/NodePostSettingsTest.php b/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
similarity index 98%
rename from core/modules/node/src/Tests/NodePostSettingsTest.php
rename to core/modules/node/tests/src/Functional/NodePostSettingsTest.php
index bc3dd99..c59c42d 100644
--- a/core/modules/node/src/Tests/NodePostSettingsTest.php
+++ b/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests that the post information (submitted by Username on date) text displays
diff --git a/core/modules/node/src/Tests/NodeQueryAlterTest.php b/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeQueryAlterTest.php
rename to core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
index 022625b..ee9afe2 100644
--- a/core/modules/node/src/Tests/NodeQueryAlterTest.php
+++ b/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests that node access queries are properly altered by the node module.
diff --git a/core/modules/node/src/Tests/NodeRSSContentTest.php b/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeRSSContentTest.php
rename to core/modules/node/tests/src/Functional/NodeRSSContentTest.php
index d1ce240..de77927 100644
--- a/core/modules/node/src/Tests/NodeRSSContentTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\filter\Entity\FilterFormat;
 
diff --git a/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php b/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
rename to core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
index e000fb8..27d6857 100644
--- a/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests user permissions for node revisions.
diff --git a/core/modules/node/src/Tests/NodeRevisionsAllTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeRevisionsAllTest.php
rename to core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
index 7963aa0..9f3949e 100644
--- a/core/modules/node/src/Tests/NodeRevisionsAllTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\NodeInterface;
 
diff --git a/core/modules/node/src/Tests/NodeRevisionsTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeRevisionsTest.php
rename to core/modules/node/tests/src/Functional/NodeRevisionsTest.php
index bfdd213..eb31671 100644
--- a/core/modules/node/src/Tests/NodeRevisionsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Url;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/node/src/Tests/NodeRevisionsUiBypassAccessTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php
similarity index 98%
rename from core/modules/node/src/Tests/NodeRevisionsUiBypassAccessTest.php
rename to core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php
index a6ffb3b..f2c750c 100644
--- a/core/modules/node/src/Tests/NodeRevisionsUiBypassAccessTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\NodeType;
 
diff --git a/core/modules/node/src/Tests/NodeRevisionsUiTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeRevisionsUiTest.php
rename to core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
index cf609b8..f298af4 100644
--- a/core/modules/node/src/Tests/NodeRevisionsUiTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Url;
 use Drupal\node\Entity\Node;
diff --git a/core/modules/node/src/Tests/NodeSaveTest.php b/core/modules/node/tests/src/Functional/NodeSaveTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeSaveTest.php
rename to core/modules/node/tests/src/Functional/NodeSaveTest.php
index f01724b..2d35ac0 100644
--- a/core/modules/node/src/Tests/NodeSaveTest.php
+++ b/core/modules/node/tests/src/Functional/NodeSaveTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\Node;
 
diff --git a/core/modules/node/src/Tests/NodeSyndicateBlockTest.php b/core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php
similarity index 95%
rename from core/modules/node/src/Tests/NodeSyndicateBlockTest.php
rename to core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php
index 31b216f..2f43843 100644
--- a/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
+++ b/core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests if the syndicate block is available.
diff --git a/core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php b/core/modules/node/tests/src/Functional/NodeTemplateSuggestionsTest.php
similarity index 97%
rename from core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php
rename to core/modules/node/tests/src/Functional/NodeTemplateSuggestionsTest.php
index ec768e6..16dee43 100644
--- a/core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTemplateSuggestionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests node template suggestions.
diff --git a/core/modules/node/src/Tests/NodeTestBase.php b/core/modules/node/tests/src/Functional/NodeTestBase.php
similarity index 96%
rename from core/modules/node/src/Tests/NodeTestBase.php
rename to core/modules/node/tests/src/Functional/NodeTestBase.php
index d4799d4..c3b269e 100644
--- a/core/modules/node/src/Tests/NodeTestBase.php
+++ b/core/modules/node/tests/src/Functional/NodeTestBase.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Session\AccountInterface;
 use Drupal\node\NodeInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Sets up page and article content types.
  */
-abstract class NodeTestBase extends WebTestBase {
+abstract class NodeTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/node/src/Tests/NodeTitleTest.php b/core/modules/node/tests/src/Functional/NodeTitleTest.php
similarity index 98%
rename from core/modules/node/src/Tests/NodeTitleTest.php
rename to core/modules/node/tests/src/Functional/NodeTitleTest.php
index 59ee021..38d5752 100644
--- a/core/modules/node/src/Tests/NodeTitleTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTitleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Component\Utility\Html;
diff --git a/core/modules/node/src/Tests/NodeTitleXSSTest.php b/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
similarity index 96%
rename from core/modules/node/src/Tests/NodeTitleXSSTest.php
rename to core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
index c410275..46e9ad0 100644
--- a/core/modules/node/src/Tests/NodeTitleXSSTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Component\Utility\Html;
 
diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeTranslationUITest.php
rename to core/modules/node/tests/src/Functional/NodeTranslationUITest.php
index 063469d..3d2d92e 100644
--- a/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\content_translation\Tests\ContentTranslationUITestBase;
diff --git a/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php b/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
rename to core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
index 73bfdb3..adf2e3f 100644
--- a/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 
diff --git a/core/modules/node/src/Tests/NodeTypeTest.php b/core/modules/node/tests/src/Functional/NodeTypeTest.php
similarity index 99%
rename from core/modules/node/src/Tests/NodeTypeTest.php
rename to core/modules/node/tests/src/Functional/NodeTypeTest.php
index 0d2d8de..3a64128 100644
--- a/core/modules/node/src/Tests/NodeTypeTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\node\Entity\NodeType;
diff --git a/core/modules/node/src/Tests/NodeTypeTranslationTest.php b/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
similarity index 97%
rename from core/modules/node/src/Tests/NodeTypeTranslationTest.php
rename to core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
index 1c3a768..067deca 100644
--- a/core/modules/node/src/Tests/NodeTypeTranslationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Ensures that node types translation work correctly.
@@ -15,7 +15,7 @@
  *
  * @group node
  */
-class NodeTypeTranslationTest extends WebTestBase {
+class NodeTypeTranslationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/node/src/Tests/NodeViewLanguageTest.php b/core/modules/node/tests/src/Functional/NodeViewLanguageTest.php
similarity index 95%
rename from core/modules/node/src/Tests/NodeViewLanguageTest.php
rename to core/modules/node/tests/src/Functional/NodeViewLanguageTest.php
index 71fe4d1..518d5fb 100644
--- a/core/modules/node/src/Tests/NodeViewLanguageTest.php
+++ b/core/modules/node/tests/src/Functional/NodeViewLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 
diff --git a/core/modules/node/src/Tests/NodeViewTest.php b/core/modules/node/tests/src/Functional/NodeViewTest.php
similarity index 98%
rename from core/modules/node/src/Tests/NodeViewTest.php
rename to core/modules/node/tests/src/Functional/NodeViewTest.php
index fae056c..048c06e 100644
--- a/core/modules/node/src/Tests/NodeViewTest.php
+++ b/core/modules/node/tests/src/Functional/NodeViewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests the node/{node} page.
diff --git a/core/modules/node/src/Tests/PagePreviewTest.php b/core/modules/node/tests/src/Functional/PagePreviewTest.php
similarity index 99%
rename from core/modules/node/src/Tests/PagePreviewTest.php
rename to core/modules/node/tests/src/Functional/PagePreviewTest.php
index 2bfd2e7..51e249b 100644
--- a/core/modules/node/src/Tests/PagePreviewTest.php
+++ b/core/modules/node/tests/src/Functional/PagePreviewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
diff --git a/core/modules/node/src/Tests/PageViewTest.php b/core/modules/node/tests/src/Functional/PageViewTest.php
similarity index 96%
rename from core/modules/node/src/Tests/PageViewTest.php
rename to core/modules/node/tests/src/Functional/PageViewTest.php
index 086b3e1..ec6daba 100644
--- a/core/modules/node/src/Tests/PageViewTest.php
+++ b/core/modules/node/tests/src/Functional/PageViewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\Node;
 
diff --git a/core/modules/node/src/Tests/SummaryLengthTest.php b/core/modules/node/tests/src/Functional/SummaryLengthTest.php
similarity index 98%
rename from core/modules/node/src/Tests/SummaryLengthTest.php
rename to core/modules/node/tests/src/Functional/SummaryLengthTest.php
index 35eb0dd..82826ae 100644
--- a/core/modules/node/src/Tests/SummaryLengthTest.php
+++ b/core/modules/node/tests/src/Functional/SummaryLengthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\Node;
 
diff --git a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php
similarity index 97%
rename from core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
rename to core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php
index c8db96e..68912a4 100644
--- a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
+++ b/core/modules/page_cache/tests/src/Functional/PageCacheTagsIntegrationTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\page_cache\Tests;
+namespace Drupal\Tests\page_cache\Functional;
 
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 
 /**
@@ -15,7 +15,7 @@
  * @see \Drupal\node\Tests\NodePageCacheTest
  * @see \Drupal\menu_ui\Tests\MenuTest::testMenuBlockPageCacheTags()
  */
-class PageCacheTagsIntegrationTest extends WebTestBase {
+class PageCacheTagsIntegrationTest extends BrowserTestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
diff --git a/core/modules/page_cache/src/Tests/PageCacheTest.php b/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
similarity index 99%
rename from core/modules/page_cache/src/Tests/PageCacheTest.php
rename to core/modules/page_cache/tests/src/Functional/PageCacheTest.php
index 22b8b51..981de94 100644
--- a/core/modules/page_cache/src/Tests/PageCacheTest.php
+++ b/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\page_cache\Tests;
+namespace Drupal\Tests\page_cache\Functional;
 
 use Drupal\Component\Datetime\DateTimePlus;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Url;
 use Drupal\entity_test\Entity\EntityTest;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Cache\Cache;
 use Drupal\user\RoleInterface;
 
@@ -15,7 +15,7 @@
  *
  * @group page_cache
  */
-class PageCacheTest extends WebTestBase {
+class PageCacheTest extends BrowserTestBase {
 
   protected $dumpHeaders = TRUE;
 
diff --git a/core/modules/path/src/Tests/PathAdminTest.php b/core/modules/path/tests/src/Functional/PathAdminTest.php
similarity index 98%
rename from core/modules/path/src/Tests/PathAdminTest.php
rename to core/modules/path/tests/src/Functional/PathAdminTest.php
index 906ce64..a27840d 100644
--- a/core/modules/path/src/Tests/PathAdminTest.php
+++ b/core/modules/path/tests/src/Functional/PathAdminTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 /**
  * Tests the Path admin UI.
diff --git a/core/modules/path/src/Tests/PathAliasTest.php b/core/modules/path/tests/src/Functional/PathAliasTest.php
similarity index 99%
rename from core/modules/path/src/Tests/PathAliasTest.php
rename to core/modules/path/tests/src/Functional/PathAliasTest.php
index c7e70d2..84c8c51 100644
--- a/core/modules/path/src/Tests/PathAliasTest.php
+++ b/core/modules/path/tests/src/Functional/PathAliasTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Cache\Cache;
diff --git a/core/modules/path/src/Tests/PathLanguageTest.php b/core/modules/path/tests/src/Functional/PathLanguageTest.php
similarity index 99%
rename from core/modules/path/src/Tests/PathLanguageTest.php
rename to core/modules/path/tests/src/Functional/PathLanguageTest.php
index 695f6be..7846b98 100644
--- a/core/modules/path/src/Tests/PathLanguageTest.php
+++ b/core/modules/path/tests/src/Functional/PathLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 /**
  * Confirm that paths work with translated nodes.
diff --git a/core/modules/path/src/Tests/PathLanguageUiTest.php b/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
similarity index 98%
rename from core/modules/path/src/Tests/PathLanguageUiTest.php
rename to core/modules/path/tests/src/Functional/PathLanguageUiTest.php
index 540cc85..f17bb60 100644
--- a/core/modules/path/src/Tests/PathLanguageUiTest.php
+++ b/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 /**
  * Confirm that the Path module user interface works with languages.
diff --git a/core/modules/path/src/Tests/PathNodeFormTest.php b/core/modules/path/tests/src/Functional/PathNodeFormTest.php
similarity index 96%
rename from core/modules/path/src/Tests/PathNodeFormTest.php
rename to core/modules/path/tests/src/Functional/PathNodeFormTest.php
index 79b43a7..fec8979 100644
--- a/core/modules/path/src/Tests/PathNodeFormTest.php
+++ b/core/modules/path/tests/src/Functional/PathNodeFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 /**
  * Tests the Path Node form UI.
diff --git a/core/modules/path/src/Tests/PathTaxonomyTermTest.php b/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
similarity index 98%
rename from core/modules/path/src/Tests/PathTaxonomyTermTest.php
rename to core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
index f62fb6c..30df7fa 100644
--- a/core/modules/path/src/Tests/PathTaxonomyTermTest.php
+++ b/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 use Drupal\taxonomy\Entity\Vocabulary;
 
diff --git a/core/modules/path/src/Tests/PathTestBase.php b/core/modules/path/tests/src/Functional/PathTestBase.php
similarity index 79%
rename from core/modules/path/src/Tests/PathTestBase.php
rename to core/modules/path/tests/src/Functional/PathTestBase.php
index c4a88af..ef83396 100644
--- a/core/modules/path/src/Tests/PathTestBase.php
+++ b/core/modules/path/tests/src/Functional/PathTestBase.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Provides a base class for testing the Path module.
  */
-abstract class PathTestBase extends WebTestBase {
+abstract class PathTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php b/core/modules/quickedit/tests/src/Functional/QuickEditAutocompleteTermTest.php
similarity index 98%
rename from core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
rename to core/modules/quickedit/tests/src/Functional/QuickEditAutocompleteTermTest.php
index 1eedb1c..1aab392 100644
--- a/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
+++ b/core/modules/quickedit/tests/src/Functional/QuickEditAutocompleteTermTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\quickedit\Tests;
+namespace Drupal\Tests\quickedit\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\taxonomy\Entity\Term;
 
@@ -16,7 +16,7 @@
  *
  * @group quickedit
  */
-class QuickEditAutocompleteTermTest extends WebTestBase {
+class QuickEditAutocompleteTermTest extends BrowserTestBase {
 
   use EntityReferenceTestTrait;
 
diff --git a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php b/core/modules/quickedit/tests/src/Functional/QuickEditLoadingTest.php
similarity index 99%
rename from core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
rename to core/modules/quickedit/tests/src/Functional/QuickEditLoadingTest.php
index 2a91fec..58a3d96 100644
--- a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
+++ b/core/modules/quickedit/tests/src/Functional/QuickEditLoadingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\quickedit\Tests;
+namespace Drupal\Tests\quickedit\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\Unicode;
@@ -11,7 +11,7 @@
 use Drupal\Core\Url;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -20,7 +20,7 @@
  *
  * @group quickedit
  */
-class QuickEditLoadingTest extends WebTestBase {
+class QuickEditLoadingTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/rdf/src/Tests/CommentAttributesTest.php b/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
similarity index 99%
rename from core/modules/rdf/src/Tests/CommentAttributesTest.php
rename to core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
index 5febcb9..92e6dda 100644
--- a/core/modules/rdf/src/Tests/CommentAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\CommentManagerInterface;
diff --git a/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php b/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
similarity index 99%
rename from core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php
rename to core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
index 48653a5..4aaeb7e 100644
--- a/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\taxonomy\Tests\TaxonomyTestBase;
diff --git a/core/modules/rdf/src/Tests/FileFieldAttributesTest.php b/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
similarity index 98%
rename from core/modules/rdf/src/Tests/FileFieldAttributesTest.php
rename to core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
index 34e76ae..b0be922 100644
--- a/core/modules/rdf/src/Tests/FileFieldAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\file\Tests\FileFieldTestBase;
 use Drupal\file\Entity\File;
diff --git a/core/modules/rdf/src/Tests/GetNamespacesTest.php b/core/modules/rdf/tests/src/Functional/GetNamespacesTest.php
similarity index 92%
rename from core/modules/rdf/src/Tests/GetNamespacesTest.php
rename to core/modules/rdf/tests/src/Functional/GetNamespacesTest.php
index 8aeaf79..c3db567 100644
--- a/core/modules/rdf/src/Tests/GetNamespacesTest.php
+++ b/core/modules/rdf/tests/src/Functional/GetNamespacesTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Confirm that the serialization of RDF namespaces in present in the HTML
@@ -10,7 +10,7 @@
  *
  * @group rdf
  */
-class GetNamespacesTest extends WebTestBase {
+class GetNamespacesTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php b/core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php
similarity index 90%
rename from core/modules/rdf/src/Tests/GetRdfNamespacesTest.php
rename to core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php
index 7fde6f0..544b598 100644
--- a/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php
+++ b/core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests hook_rdf_namespaces().
  *
  * @group rdf
  */
-class GetRdfNamespacesTest extends WebTestBase {
+class GetRdfNamespacesTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php b/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
similarity index 98%
rename from core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
rename to core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
index cce663b..6730b92 100644
--- a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\image\Entity\ImageStyle;
 use Drupal\image\Tests\ImageFieldTestBase;
diff --git a/core/modules/rdf/src/Tests/NodeAttributesTest.php b/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
similarity index 98%
rename from core/modules/rdf/src/Tests/NodeAttributesTest.php
rename to core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
index 5c6b267..e0b8bdf 100644
--- a/core/modules/rdf/src/Tests/NodeAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\node\Tests\NodeTestBase;
 
diff --git a/core/modules/rdf/src/Tests/StandardProfileTest.php b/core/modules/rdf/tests/src/Functional/StandardProfileTest.php
similarity index 99%
rename from core/modules/rdf/src/Tests/StandardProfileTest.php
rename to core/modules/rdf/tests/src/Functional/StandardProfileTest.php
index d8aa1b1..6f04f5c 100644
--- a/core/modules/rdf/src/Tests/StandardProfileTest.php
+++ b/core/modules/rdf/tests/src/Functional/StandardProfileTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\Core\Url;
 use Drupal\file\Entity\File;
 use Drupal\image\Entity\ImageStyle;
 use Drupal\node\Entity\NodeType;
 use Drupal\node\NodeInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\comment\Entity\Comment;
 use Drupal\taxonomy\Entity\Term;
 
@@ -16,7 +16,7 @@
  *
  * @group rdf
  */
-class StandardProfileTest extends WebTestBase {
+class StandardProfileTest extends BrowserTestBase {
 
   /**
    * The profile used during tests.
diff --git a/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php b/core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php
similarity index 98%
rename from core/modules/rdf/src/Tests/TaxonomyAttributesTest.php
rename to core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php
index 6be2c5b..799b764 100644
--- a/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\taxonomy\Tests\TaxonomyTestBase;
 
diff --git a/core/modules/rdf/src/Tests/UserAttributesTest.php b/core/modules/rdf/tests/src/Functional/UserAttributesTest.php
similarity index 96%
rename from core/modules/rdf/src/Tests/UserAttributesTest.php
rename to core/modules/rdf/tests/src/Functional/UserAttributesTest.php
index 232b5b2..82c70d9 100644
--- a/core/modules/rdf/src/Tests/UserAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/UserAttributesTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the RDFa markup of Users.
  *
  * @group rdf
  */
-class UserAttributesTest extends WebTestBase {
+class UserAttributesTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
similarity index 97%
rename from core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
rename to core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
index 8f8b505..b89a8f1 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
+++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\responsive_image\Tests;
+namespace Drupal\Tests\responsive_image\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Thoroughly test the administrative interface of the Responsive Image module.
  *
  * @group responsive_image
  */
-class ResponsiveImageAdminUITest extends WebTestBase {
+class ResponsiveImageAdminUITest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
similarity index 99%
rename from core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
rename to core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
index f5b277d..111a27a 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\responsive_image\Tests;
+namespace Drupal\Tests\responsive_image\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\image\Tests\ImageFieldTestBase;
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldUiTest.php
similarity index 97%
rename from core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
rename to core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldUiTest.php
index 8b1030f..055b74e 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldUiTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\responsive_image\Tests;
+namespace Drupal\Tests\responsive_image\Functional;
 
 
 use Drupal\field_ui\Tests\FieldUiTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\responsive_image\Entity\ResponsiveImageStyle;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group responsive_image
  */
-class ResponsiveImageFieldUiTest extends WebTestBase {
+class ResponsiveImageFieldUiTest extends BrowserTestBase {
 
   use FieldUiTestTrait;
 
diff --git a/core/modules/rest/src/Tests/AuthTest.php b/core/modules/rest/tests/src/Functional/AuthTest.php
similarity index 98%
rename from core/modules/rest/src/Tests/AuthTest.php
rename to core/modules/rest/tests/src/Functional/AuthTest.php
index 9f4224f..6f484c7 100644
--- a/core/modules/rest/src/Tests/AuthTest.php
+++ b/core/modules/rest/tests/src/Functional/AuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\Core\Url;
 
diff --git a/core/modules/rest/src/Tests/CreateTest.php b/core/modules/rest/tests/src/Functional/CreateTest.php
similarity index 99%
rename from core/modules/rest/src/Tests/CreateTest.php
rename to core/modules/rest/tests/src/Functional/CreateTest.php
index 8c7db07..2f392de 100644
--- a/core/modules/rest/src/Tests/CreateTest.php
+++ b/core/modules/rest/tests/src/Functional/CreateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Component\Serialization\Json;
diff --git a/core/modules/rest/src/Tests/CsrfTest.php b/core/modules/rest/tests/src/Functional/CsrfTest.php
similarity index 98%
rename from core/modules/rest/src/Tests/CsrfTest.php
rename to core/modules/rest/tests/src/Functional/CsrfTest.php
index f0063ad..2fafb2a 100644
--- a/core/modules/rest/src/Tests/CsrfTest.php
+++ b/core/modules/rest/tests/src/Functional/CsrfTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\Core\Url;
 
diff --git a/core/modules/rest/src/Tests/DeleteTest.php b/core/modules/rest/tests/src/Functional/DeleteTest.php
similarity index 98%
rename from core/modules/rest/src/Tests/DeleteTest.php
rename to core/modules/rest/tests/src/Functional/DeleteTest.php
index a144342..cdf2c62 100644
--- a/core/modules/rest/src/Tests/DeleteTest.php
+++ b/core/modules/rest/tests/src/Functional/DeleteTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\Core\Url;
 
diff --git a/core/modules/rest/src/Tests/NodeTest.php b/core/modules/rest/tests/src/Functional/NodeTest.php
similarity index 99%
rename from core/modules/rest/src/Tests/NodeTest.php
rename to core/modules/rest/tests/src/Functional/NodeTest.php
index 95dc475..bb31a53 100644
--- a/core/modules/rest/src/Tests/NodeTest.php
+++ b/core/modules/rest/tests/src/Functional/NodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\Core\Url;
 use Drupal\node\Entity\Node;
diff --git a/core/modules/rest/src/Tests/PageCacheTest.php b/core/modules/rest/tests/src/Functional/PageCacheTest.php
similarity index 99%
rename from core/modules/rest/src/Tests/PageCacheTest.php
rename to core/modules/rest/tests/src/Functional/PageCacheTest.php
index 66e57f5..e04c00a 100644
--- a/core/modules/rest/src/Tests/PageCacheTest.php
+++ b/core/modules/rest/tests/src/Functional/PageCacheTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Url;
diff --git a/core/modules/rest/src/Tests/RESTTestBase.php b/core/modules/rest/tests/src/Functional/RESTTestBase.php
similarity index 99%
rename from core/modules/rest/src/Tests/RESTTestBase.php
rename to core/modules/rest/tests/src/Functional/RESTTestBase.php
index a7fb62a..3d9ffe2 100644
--- a/core/modules/rest/src/Tests/RESTTestBase.php
+++ b/core/modules/rest/tests/src/Functional/RESTTestBase.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\node\NodeInterface;
 use Drupal\rest\RestResourceConfigInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test helper class that provides a REST client method to send HTTP requests.
  */
-abstract class RESTTestBase extends WebTestBase {
+abstract class RESTTestBase extends BrowserTestBase {
 
   /**
    * The REST resource config storage.
diff --git a/core/modules/rest/src/Tests/ReadTest.php b/core/modules/rest/tests/src/Functional/ReadTest.php
similarity index 99%
rename from core/modules/rest/src/Tests/ReadTest.php
rename to core/modules/rest/tests/src/Functional/ReadTest.php
index dc6f574..347f5ab 100644
--- a/core/modules/rest/src/Tests/ReadTest.php
+++ b/core/modules/rest/tests/src/Functional/ReadTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
diff --git a/core/modules/rest/src/Tests/ResourceTest.php b/core/modules/rest/tests/src/Functional/ResourceTest.php
similarity index 99%
rename from core/modules/rest/src/Tests/ResourceTest.php
rename to core/modules/rest/tests/src/Functional/ResourceTest.php
index 72bed0f..2e16dee 100644
--- a/core/modules/rest/src/Tests/ResourceTest.php
+++ b/core/modules/rest/tests/src/Functional/ResourceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\Core\Session\AccountInterface;
 use Drupal\rest\RestResourceConfigInterface;
diff --git a/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php b/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
rename to core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
index 9bd13bd..880522a 100644
--- a/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
+++ b/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Indexes content and tests the advanced search form.
diff --git a/core/modules/search/src/Tests/SearchBlockTest.php b/core/modules/search/tests/src/Functional/SearchBlockTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchBlockTest.php
rename to core/modules/search/tests/src/Functional/SearchBlockTest.php
index 7d42a85..1b670e3 100644
--- a/core/modules/search/src/Tests/SearchBlockTest.php
+++ b/core/modules/search/tests/src/Functional/SearchBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests if the search form block is available.
diff --git a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php b/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchCommentCountToggleTest.php
rename to core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
index 48f8bb6..a6bf35e 100644
--- a/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
+++ b/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
diff --git a/core/modules/search/src/Tests/SearchCommentTest.php b/core/modules/search/tests/src/Functional/SearchCommentTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchCommentTest.php
rename to core/modules/search/tests/src/Functional/SearchCommentTest.php
index f67637f..7b70f35 100644
--- a/core/modules/search/src/Tests/SearchCommentTest.php
+++ b/core/modules/search/tests/src/Functional/SearchCommentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
diff --git a/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php b/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
rename to core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
index 9ca87d6..105e88e 100644
--- a/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
+++ b/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\Core\Url;
 use Drupal\search\Entity\SearchPage;
diff --git a/core/modules/search/src/Tests/SearchDateIntervalTest.php b/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchDateIntervalTest.php
rename to core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
index 967f1f5..0ca15c0 100644
--- a/core/modules/search/src/Tests/SearchDateIntervalTest.php
+++ b/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 
diff --git a/core/modules/search/src/Tests/SearchEmbedFormTest.php b/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchEmbedFormTest.php
rename to core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
index 22da9b6..735afd6 100644
--- a/core/modules/search/src/Tests/SearchEmbedFormTest.php
+++ b/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Verifies that a form embedded in search results works.
diff --git a/core/modules/search/src/Tests/SearchExactTest.php b/core/modules/search/tests/src/Functional/SearchExactTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchExactTest.php
rename to core/modules/search/tests/src/Functional/SearchExactTest.php
index d17646b..6280364 100644
--- a/core/modules/search/src/Tests/SearchExactTest.php
+++ b/core/modules/search/tests/src/Functional/SearchExactTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests that searching for a phrase gets the correct page count.
diff --git a/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php b/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchKeywordsConditionsTest.php
rename to core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
index 1625d8d..a75fcb5 100644
--- a/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php
+++ b/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\Component\Utility\Html;
 
diff --git a/core/modules/search/src/Tests/SearchLanguageTest.php b/core/modules/search/tests/src/Functional/SearchLanguageTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchLanguageTest.php
rename to core/modules/search/tests/src/Functional/SearchLanguageTest.php
index cdd0bd4..07d7696 100644
--- a/core/modules/search/src/Tests/SearchLanguageTest.php
+++ b/core/modules/search/tests/src/Functional/SearchLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
diff --git a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php b/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchMultilingualEntityTest.php
rename to core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
index e133101..faaa93f 100644
--- a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
+++ b/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
diff --git a/core/modules/search/src/Tests/SearchNodeDiacriticsTest.php b/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchNodeDiacriticsTest.php
rename to core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
index a8b45a5..27baa4b 100644
--- a/core/modules/search/src/Tests/SearchNodeDiacriticsTest.php
+++ b/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests search functionality with diacritics.
diff --git a/core/modules/search/src/Tests/SearchNodePunctuationTest.php b/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchNodePunctuationTest.php
rename to core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
index c185aea..0d0a129 100644
--- a/core/modules/search/src/Tests/SearchNodePunctuationTest.php
+++ b/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests search functionality with punctuation and HTML entities.
diff --git a/core/modules/search/src/Tests/SearchNumberMatchingTest.php b/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchNumberMatchingTest.php
rename to core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
index a6ad057..e36cbe4 100644
--- a/core/modules/search/src/Tests/SearchNumberMatchingTest.php
+++ b/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 
diff --git a/core/modules/search/src/Tests/SearchNumbersTest.php b/core/modules/search/tests/src/Functional/SearchNumbersTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchNumbersTest.php
rename to core/modules/search/tests/src/Functional/SearchNumbersTest.php
index 30d3906..c438b9c 100644
--- a/core/modules/search/src/Tests/SearchNumbersTest.php
+++ b/core/modules/search/tests/src/Functional/SearchNumbersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 
diff --git a/core/modules/search/src/Tests/SearchPageCacheTagsTest.php b/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchPageCacheTagsTest.php
rename to core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php
index 3a7bc67..d05c83f 100644
--- a/core/modules/search/src/Tests/SearchPageCacheTagsTest.php
+++ b/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\Core\Cache\Cache;
 
diff --git a/core/modules/search/src/Tests/SearchPageOverrideTest.php b/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
similarity index 96%
rename from core/modules/search/src/Tests/SearchPageOverrideTest.php
rename to core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
index 9768904..88edab1 100644
--- a/core/modules/search/src/Tests/SearchPageOverrideTest.php
+++ b/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests if the result page can be overridden.
diff --git a/core/modules/search/src/Tests/SearchPageTextTest.php b/core/modules/search/tests/src/Functional/SearchPageTextTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchPageTextTest.php
rename to core/modules/search/tests/src/Functional/SearchPageTextTest.php
index db33d85..36c3ae5 100644
--- a/core/modules/search/src/Tests/SearchPageTextTest.php
+++ b/core/modules/search/tests/src/Functional/SearchPageTextTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php b/core/modules/search/tests/src/Functional/SearchPreprocessLangcodeTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php
rename to core/modules/search/tests/src/Functional/SearchPreprocessLangcodeTest.php
index 38cb350..a21122e 100644
--- a/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php
+++ b/core/modules/search/tests/src/Functional/SearchPreprocessLangcodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests that the search preprocessing uses the correct language code.
diff --git a/core/modules/search/src/Tests/SearchQueryAlterTest.php b/core/modules/search/tests/src/Functional/SearchQueryAlterTest.php
similarity index 97%
rename from core/modules/search/src/Tests/SearchQueryAlterTest.php
rename to core/modules/search/tests/src/Functional/SearchQueryAlterTest.php
index 0cb473f..2bda83a 100644
--- a/core/modules/search/src/Tests/SearchQueryAlterTest.php
+++ b/core/modules/search/tests/src/Functional/SearchQueryAlterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests that the node search query can be altered via the query alter hook.
diff --git a/core/modules/search/src/Tests/SearchRankingTest.php b/core/modules/search/tests/src/Functional/SearchRankingTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchRankingTest.php
rename to core/modules/search/tests/src/Functional/SearchRankingTest.php
index 2045233..0244592 100644
--- a/core/modules/search/src/Tests/SearchRankingTest.php
+++ b/core/modules/search/tests/src/Functional/SearchRankingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
diff --git a/core/modules/search/src/Tests/SearchSetLocaleTest.php b/core/modules/search/tests/src/Functional/SearchSetLocaleTest.php
similarity index 96%
rename from core/modules/search/src/Tests/SearchSetLocaleTest.php
rename to core/modules/search/tests/src/Functional/SearchSetLocaleTest.php
index 0ec4137..4291598 100644
--- a/core/modules/search/src/Tests/SearchSetLocaleTest.php
+++ b/core/modules/search/tests/src/Functional/SearchSetLocaleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests that search works with numeric locale settings.
diff --git a/core/modules/search/src/Tests/SearchSimplifyTest.php b/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
similarity index 98%
rename from core/modules/search/src/Tests/SearchSimplifyTest.php
rename to core/modules/search/tests/src/Functional/SearchSimplifyTest.php
index bdb96c9..6e7bb84 100644
--- a/core/modules/search/src/Tests/SearchSimplifyTest.php
+++ b/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 use Drupal\Component\Utility\Unicode;
 
 /**
diff --git a/core/modules/search/src/Tests/SearchTestBase.php b/core/modules/search/tests/src/Functional/SearchTestBase.php
similarity index 95%
rename from core/modules/search/src/Tests/SearchTestBase.php
rename to core/modules/search/tests/src/Functional/SearchTestBase.php
index 83967b3..93e0ee2 100644
--- a/core/modules/search/src/Tests/SearchTestBase.php
+++ b/core/modules/search/tests/src/Functional/SearchTestBase.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Defines the common search test code.
  */
-abstract class SearchTestBase extends WebTestBase {
+abstract class SearchTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/search/src/Tests/SearchTokenizerTest.php b/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
similarity index 99%
rename from core/modules/search/src/Tests/SearchTokenizerTest.php
rename to core/modules/search/tests/src/Functional/SearchTokenizerTest.php
index f8b3ccb..e25bfc4 100644
--- a/core/modules/search/src/Tests/SearchTokenizerTest.php
+++ b/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 use Drupal\Component\Utility\Unicode;
 
 /**
diff --git a/core/modules/serialization/src/Tests/EntityResolverTest.php b/core/modules/serialization/tests/src/Functional/EntityResolverTest.php
similarity index 98%
rename from core/modules/serialization/src/Tests/EntityResolverTest.php
rename to core/modules/serialization/tests/src/Functional/EntityResolverTest.php
index 6fca3c7..0226978 100644
--- a/core/modules/serialization/src/Tests/EntityResolverTest.php
+++ b/core/modules/serialization/tests/src/Functional/EntityResolverTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\serialization\Tests;
+namespace Drupal\Tests\serialization\Functional;
 
 use Drupal\Core\Url;
 use Drupal\entity_test\Entity\EntityTestMulRev;
diff --git a/core/modules/serialization/src/Tests/EntitySerializationTest.php b/core/modules/serialization/tests/src/Functional/EntitySerializationTest.php
similarity index 99%
rename from core/modules/serialization/src/Tests/EntitySerializationTest.php
rename to core/modules/serialization/tests/src/Functional/EntitySerializationTest.php
index 00ea14f..66a04a1 100644
--- a/core/modules/serialization/src/Tests/EntitySerializationTest.php
+++ b/core/modules/serialization/tests/src/Functional/EntitySerializationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\serialization\Tests;
+namespace Drupal\Tests\serialization\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\entity_test\Entity\EntityTestMulRev;
diff --git a/core/modules/serialization/src/Tests/NormalizerTestBase.php b/core/modules/serialization/tests/src/Functional/NormalizerTestBase.php
similarity index 96%
rename from core/modules/serialization/src/Tests/NormalizerTestBase.php
rename to core/modules/serialization/tests/src/Functional/NormalizerTestBase.php
index fc272f7..1467c34 100644
--- a/core/modules/serialization/src/Tests/NormalizerTestBase.php
+++ b/core/modules/serialization/tests/src/Functional/NormalizerTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\serialization\Tests;
+namespace Drupal\Tests\serialization\Functional;
 
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/serialization/src/Tests/RegisterSerializationClassesCompilerPassTest.php b/core/modules/serialization/tests/src/Functional/RegisterSerializationClassesCompilerPassTest.php
similarity index 97%
rename from core/modules/serialization/src/Tests/RegisterSerializationClassesCompilerPassTest.php
rename to core/modules/serialization/tests/src/Functional/RegisterSerializationClassesCompilerPassTest.php
index 6406bbb..5f18927 100644
--- a/core/modules/serialization/src/Tests/RegisterSerializationClassesCompilerPassTest.php
+++ b/core/modules/serialization/tests/src/Functional/RegisterSerializationClassesCompilerPassTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\serialization\Tests;
+namespace Drupal\Tests\serialization\Functional;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\serialization\RegisterSerializationClassesCompilerPass;
diff --git a/core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php b/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
similarity index 97%
rename from core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php
rename to core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
index a437ffb..23f0145 100644
--- a/core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\shortcut\Tests;
+namespace Drupal\Tests\shortcut\Functional;
 
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\shortcut\Entity\Shortcut;
diff --git a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php b/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
similarity index 99%
rename from core/modules/shortcut/src/Tests/ShortcutLinksTest.php
rename to core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
index c6efe41..355a98f 100644
--- a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\shortcut\Tests;
+namespace Drupal\Tests\shortcut\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Url;
diff --git a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php b/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
similarity index 99%
rename from core/modules/shortcut/src/Tests/ShortcutSetsTest.php
rename to core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
index 3a04757..e51d776 100644
--- a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\shortcut\Tests;
+namespace Drupal\Tests\shortcut\Functional;
 
 use Drupal\shortcut\Entity\ShortcutSet;
 
diff --git a/core/modules/shortcut/src/Tests/ShortcutTestBase.php b/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php
similarity index 96%
rename from core/modules/shortcut/src/Tests/ShortcutTestBase.php
rename to core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php
index b32afb2..1cb063a 100644
--- a/core/modules/shortcut/src/Tests/ShortcutTestBase.php
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\shortcut\Tests;
+namespace Drupal\Tests\shortcut\Functional;
 
 use Drupal\shortcut\Entity\Shortcut;
 use Drupal\shortcut\Entity\ShortcutSet;
 use Drupal\shortcut\ShortcutSetInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Defines base class for shortcut test cases.
  */
-abstract class ShortcutTestBase extends WebTestBase {
+abstract class ShortcutTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php b/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php
similarity index 98%
rename from core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
rename to core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php
index 4be41c3..10eecb1 100644
--- a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
+++ b/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\shortcut\Tests;
+namespace Drupal\Tests\shortcut\Functional;
 
 use Drupal\content_translation\Tests\ContentTranslationUITestBase;
 use Drupal\Core\Entity\EntityChangedInterface;
diff --git a/core/modules/simpletest/src/Tests/BrokenSetUpTest.php b/core/modules/simpletest/tests/src/Functional/BrokenSetUpTest.php
similarity index 96%
rename from core/modules/simpletest/src/Tests/BrokenSetUpTest.php
rename to core/modules/simpletest/tests/src/Functional/BrokenSetUpTest.php
index e988f4d..8a8cdf1 100644
--- a/core/modules/simpletest/src/Tests/BrokenSetUpTest.php
+++ b/core/modules/simpletest/tests/src/Functional/BrokenSetUpTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests a test case that does not call parent::setUp().
@@ -15,7 +15,7 @@
  * @group simpletest
  * @see \Drupal\simpletest\WebTestBase
  */
-class BrokenSetUpTest extends WebTestBase {
+class BrokenSetUpTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/simpletest/src/Tests/BrowserTest.php b/core/modules/simpletest/tests/src/Functional/BrowserTest.php
similarity index 97%
rename from core/modules/simpletest/src/Tests/BrowserTest.php
rename to core/modules/simpletest/tests/src/Functional/BrowserTest.php
index f98fe48..044c7b6 100644
--- a/core/modules/simpletest/src/Tests/BrowserTest.php
+++ b/core/modules/simpletest/tests/src/Functional/BrowserTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the internal browser of the testing framework.
  *
  * @group simpletest
  */
-class BrowserTest extends WebTestBase {
+class BrowserTest extends BrowserTestBase {
 
   /**
    * A flag indicating whether a cookie has been set in a test.
diff --git a/core/modules/simpletest/src/Tests/FolderTest.php b/core/modules/simpletest/tests/src/Functional/FolderTest.php
similarity index 77%
rename from core/modules/simpletest/src/Tests/FolderTest.php
rename to core/modules/simpletest/tests/src/Functional/FolderTest.php
index d43c638..4055976 100644
--- a/core/modules/simpletest/src/Tests/FolderTest.php
+++ b/core/modules/simpletest/tests/src/Functional/FolderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * This test will check SimpleTest's treatment of hook_install during setUp.
@@ -10,7 +10,7 @@
  *
  * @group simpletest
  */
-class FolderTest extends WebTestBase {
+class FolderTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php b/core/modules/simpletest/tests/src/Functional/InstallationProfileModuleTestsTest.php
similarity index 91%
rename from core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
rename to core/modules/simpletest/tests/src/Functional/InstallationProfileModuleTestsTest.php
index a1063e7..1029f26 100644
--- a/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
+++ b/core/modules/simpletest/tests/src/Functional/InstallationProfileModuleTestsTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Verifies that tests bundled with installation profile modules are found.
  *
  * @group simpletest
  */
-class InstallationProfileModuleTestsTest extends WebTestBase {
+class InstallationProfileModuleTestsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/simpletest/src/Tests/KernelTestBaseTest.php b/core/modules/simpletest/tests/src/Functional/KernelTestBaseTest.php
similarity index 99%
rename from core/modules/simpletest/src/Tests/KernelTestBaseTest.php
rename to core/modules/simpletest/tests/src/Functional/KernelTestBaseTest.php
index 15ecf1f..b0265ec 100644
--- a/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
+++ b/core/modules/simpletest/tests/src/Functional/KernelTestBaseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
 use Drupal\Core\Database\Database;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/simpletest/src/Tests/MailCaptureTest.php b/core/modules/simpletest/tests/src/Functional/MailCaptureTest.php
similarity index 96%
rename from core/modules/simpletest/src/Tests/MailCaptureTest.php
rename to core/modules/simpletest/tests/src/Functional/MailCaptureTest.php
index 700c757..1c0c533 100644
--- a/core/modules/simpletest/src/Tests/MailCaptureTest.php
+++ b/core/modules/simpletest/tests/src/Functional/MailCaptureTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the SimpleTest email capturing logic, the assertMail assertion and the
@@ -10,7 +10,7 @@
  *
  * @group simpletest
  */
-class MailCaptureTest extends WebTestBase {
+class MailCaptureTest extends BrowserTestBase {
   /**
    * Test to see if the wrapper function is executed correctly.
    */
diff --git a/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php b/core/modules/simpletest/tests/src/Functional/MissingCheckedRequirementsTest.php
similarity index 90%
rename from core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php
rename to core/modules/simpletest/tests/src/Functional/MissingCheckedRequirementsTest.php
index 0b21d54..4730fc5 100644
--- a/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php
+++ b/core/modules/simpletest/tests/src/Functional/MissingCheckedRequirementsTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests a test case with missing requirements.
  *
  * @group simpletest
  */
-class MissingCheckedRequirementsTest extends WebTestBase {
+class MissingCheckedRequirementsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php b/core/modules/simpletest/tests/src/Functional/MissingDependentModuleUnitTest.php
similarity index 70%
rename from core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
rename to core/modules/simpletest/tests/src/Functional/MissingDependentModuleUnitTest.php
index 9c707b8..885a44c 100644
--- a/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
+++ b/core/modules/simpletest/tests/src/Functional/MissingDependentModuleUnitTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * This test should not load since it requires a module that is not found.
@@ -10,7 +10,7 @@
  * @group simpletest
  * @dependencies simpletest_missing_module
  */
-class MissingDependentModuleUnitTest extends WebTestBase {
+class MissingDependentModuleUnitTest extends BrowserTestBase {
 
   /**
    * Ensure that this test will not be loaded despite its dependency.
diff --git a/core/modules/simpletest/src/Tests/OtherInstallationProfileTestsTest.php b/core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php
similarity index 91%
rename from core/modules/simpletest/src/Tests/OtherInstallationProfileTestsTest.php
rename to core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php
index b4263f1..71601e2 100644
--- a/core/modules/simpletest/src/Tests/OtherInstallationProfileTestsTest.php
+++ b/core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Verifies that tests in other installation profiles are found.
@@ -10,7 +10,7 @@
  * @group simpletest
  * @see SimpleTestInstallationProfileModuleTestsTestCase
  */
-class OtherInstallationProfileTestsTest extends WebTestBase {
+class OtherInstallationProfileTestsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php b/core/modules/simpletest/tests/src/Functional/SimpleTestBrowserTest.php
similarity index 97%
rename from core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
rename to core/modules/simpletest/tests/src/Functional/SimpleTestBrowserTest.php
index 91e37d3..be8140d 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
+++ b/core/modules/simpletest/tests/src/Functional/SimpleTestBrowserTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the Simpletest UI internal browser.
  *
  * @group simpletest
  */
-class SimpleTestBrowserTest extends WebTestBase {
+class SimpleTestBrowserTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/simpletest/src/Tests/SimpleTestInstallBatchTest.php b/core/modules/simpletest/tests/src/Functional/SimpleTestInstallBatchTest.php
similarity index 84%
rename from core/modules/simpletest/src/Tests/SimpleTestInstallBatchTest.php
rename to core/modules/simpletest/tests/src/Functional/SimpleTestInstallBatchTest.php
index 72cb74c..863bf10 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestInstallBatchTest.php
+++ b/core/modules/simpletest/tests/src/Functional/SimpleTestInstallBatchTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
 use Drupal\entity_test\Entity\EntityTest;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests batch operations during tests execution.
@@ -13,7 +13,7 @@
  *
  * @group simpletest
  */
-class SimpleTestInstallBatchTest extends WebTestBase {
+class SimpleTestInstallBatchTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/simpletest/src/Tests/SimpleTestTest.php b/core/modules/simpletest/tests/src/Functional/SimpleTestTest.php
similarity index 99%
rename from core/modules/simpletest/src/Tests/SimpleTestTest.php
rename to core/modules/simpletest/tests/src/Functional/SimpleTestTest.php
index 19ab17f..22003c7 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestTest.php
+++ b/core/modules/simpletest/tests/src/Functional/SimpleTestTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
 use Drupal\Component\Utility\Crypt;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests SimpleTest's web interface: check that the intended tests were run and
@@ -12,7 +12,7 @@
  *
  * @group simpletest
  */
-class SimpleTestTest extends WebTestBase {
+class SimpleTestTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/simpletest/src/Tests/TimeZoneTest.php b/core/modules/simpletest/tests/src/Functional/TimeZoneTest.php
similarity index 85%
rename from core/modules/simpletest/src/Tests/TimeZoneTest.php
rename to core/modules/simpletest/tests/src/Functional/TimeZoneTest.php
index 2f33eaa..7e348aa 100644
--- a/core/modules/simpletest/src/Tests/TimeZoneTest.php
+++ b/core/modules/simpletest/tests/src/Functional/TimeZoneTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * This test will check SimpleTest's default time zone handling.
  *
  * @group simpletest
  */
-class TimeZoneTest extends WebTestBase {
+class TimeZoneTest extends BrowserTestBase {
 
   /**
    * A user with administrative privileges.
diff --git a/core/modules/simpletest/src/Tests/UserHelpersTest.php b/core/modules/simpletest/tests/src/Functional/UserHelpersTest.php
similarity index 92%
rename from core/modules/simpletest/src/Tests/UserHelpersTest.php
rename to core/modules/simpletest/tests/src/Functional/UserHelpersTest.php
index c3fb00b..ace0e49 100644
--- a/core/modules/simpletest/src/Tests/UserHelpersTest.php
+++ b/core/modules/simpletest/tests/src/Functional/UserHelpersTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests User related helper methods of WebTestBase.
  *
  * @group simpletest
  */
-class UserHelpersTest extends WebTestBase {
+class UserHelpersTest extends BrowserTestBase {
 
   /**
    * Tests WebTestBase::drupalUserIsLoggedIn().
diff --git a/core/modules/statistics/src/Tests/StatisticsAdminTest.php b/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
similarity index 97%
rename from core/modules/statistics/src/Tests/StatisticsAdminTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
index 565925c..e151b84 100644
--- a/core/modules/statistics/src/Tests/StatisticsAdminTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the statistics admin.
  *
  * @group statistics
  */
-class StatisticsAdminTest extends WebTestBase {
+class StatisticsAdminTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/statistics/src/Tests/StatisticsAttachedTest.php b/core/modules/statistics/tests/src/Functional/StatisticsAttachedTest.php
similarity index 90%
rename from core/modules/statistics/src/Tests/StatisticsAttachedTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsAttachedTest.php
index f869b2a..9ea6e94 100644
--- a/core/modules/statistics/src/Tests/StatisticsAttachedTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsAttachedTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\node\Entity\Node;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group statistics
  */
-class StatisticsAttachedTest extends WebTestBase {
+class StatisticsAttachedTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
similarity index 97%
rename from core/modules/statistics/src/Tests/StatisticsLoggingTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
index 7cfec7c..492f489 100644
--- a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests request logging for cached and uncached pages.
@@ -12,7 +12,7 @@
  *
  * @group statistics
  */
-class StatisticsLoggingTest extends WebTestBase {
+class StatisticsLoggingTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/statistics/src/Tests/StatisticsReportsTest.php b/core/modules/statistics/tests/src/Functional/StatisticsReportsTest.php
similarity index 98%
rename from core/modules/statistics/src/Tests/StatisticsReportsTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsReportsTest.php
index 0fe2e28..b7266b2 100644
--- a/core/modules/statistics/src/Tests/StatisticsReportsTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsReportsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
diff --git a/core/modules/statistics/src/Tests/StatisticsTestBase.php b/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
similarity index 87%
rename from core/modules/statistics/src/Tests/StatisticsTestBase.php
rename to core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
index b18b0ac..97d9082 100644
--- a/core/modules/statistics/src/Tests/StatisticsTestBase.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Defines a base class for testing the Statistics module.
  */
-abstract class StatisticsTestBase extends WebTestBase {
+abstract class StatisticsTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php b/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
similarity index 97%
rename from core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
rename to core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
index b7d22b8..d586ea6 100644
--- a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
 /**
  * Generates text using placeholders for dummy content to check statistics token
diff --git a/core/modules/syslog/src/Tests/SyslogTest.php b/core/modules/syslog/tests/src/Functional/SyslogTest.php
similarity index 89%
rename from core/modules/syslog/src/Tests/SyslogTest.php
rename to core/modules/syslog/tests/src/Functional/SyslogTest.php
index a40847c..0f50c01 100644
--- a/core/modules/syslog/src/Tests/SyslogTest.php
+++ b/core/modules/syslog/tests/src/Functional/SyslogTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\syslog\Tests;
+namespace Drupal\Tests\syslog\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests syslog settings.
  *
  * @group syslog
  */
-class SyslogTest extends WebTestBase {
+class SyslogTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/taxonomy/src/Tests/EfqTest.php b/core/modules/taxonomy/tests/src/Functional/EfqTest.php
similarity index 97%
rename from core/modules/taxonomy/src/Tests/EfqTest.php
rename to core/modules/taxonomy/tests/src/Functional/EfqTest.php
index 572ae8f..1f788c8 100644
--- a/core/modules/taxonomy/src/Tests/EfqTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/EfqTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 /**
  * Verifies operation of a taxonomy-based Entity Query.
diff --git a/core/modules/taxonomy/src/Tests/LegacyTest.php b/core/modules/taxonomy/tests/src/Functional/LegacyTest.php
similarity index 98%
rename from core/modules/taxonomy/src/Tests/LegacyTest.php
rename to core/modules/taxonomy/tests/src/Functional/LegacyTest.php
index b842226..fbbe16f9 100644
--- a/core/modules/taxonomy/src/Tests/LegacyTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/LegacyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
diff --git a/core/modules/taxonomy/src/Tests/LoadMultipleTest.php b/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
similarity index 98%
rename from core/modules/taxonomy/src/Tests/LoadMultipleTest.php
rename to core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
index 349516c..4955992 100644
--- a/core/modules/taxonomy/src/Tests/LoadMultipleTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\taxonomy\Entity\Term;
 
diff --git a/core/modules/taxonomy/src/Tests/RssTest.php b/core/modules/taxonomy/tests/src/Functional/RssTest.php
similarity index 98%
rename from core/modules/taxonomy/src/Tests/RssTest.php
rename to core/modules/taxonomy/tests/src/Functional/RssTest.php
index effd4dd..a7f92e7 100644
--- a/core/modules/taxonomy/src/Tests/RssTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/RssTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\views\Views;
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
similarity index 98%
rename from core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
rename to core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
index 306e160..a9cea4e 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\user\RoleInterface;
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
similarity index 98%
rename from core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
rename to core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
index 6043d77..e89742e 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 /**
  * Ensure that the term indentation works properly.
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTermPagerTest.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php
similarity index 97%
rename from core/modules/taxonomy/src/Tests/TaxonomyTermPagerTest.php
rename to core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php
index f693988..66782f3 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTermPagerTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 /**
  * Ensures that the term pager works properly.
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTestBase.php
similarity index 82%
rename from core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
rename to core/modules/taxonomy/tests/src/Functional/TaxonomyTestBase.php
index aa91237..b53f03b 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTestBase.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Provides common helper methods for Taxonomy module tests.
  */
-abstract class TaxonomyTestBase extends WebTestBase {
+abstract class TaxonomyTestBase extends BrowserTestBase {
 
   use TaxonomyTestTrait;
   use EntityReferenceTestTrait;
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTestTrait.php
similarity index 97%
rename from core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
rename to core/modules/taxonomy/tests/src/Functional/TaxonomyTestTrait.php
index f04be00..b0eeb0d 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Language\LanguageInterface;
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php
similarity index 98%
rename from core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
rename to core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php
index 5ae6270..0a40f79 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTranslationTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
diff --git a/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php b/core/modules/taxonomy/tests/src/Functional/TermCacheTagsTest.php
similarity index 94%
rename from core/modules/taxonomy/src/Tests/TermCacheTagsTest.php
rename to core/modules/taxonomy/tests/src/Functional/TermCacheTagsTest.php
index 8d7ddad..10f24e8 100644
--- a/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
 use Drupal\taxonomy\Entity\Vocabulary;
diff --git a/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php b/core/modules/taxonomy/tests/src/Functional/TermEntityReferenceTest.php
similarity index 98%
rename from core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php
rename to core/modules/taxonomy/tests/src/Functional/TermEntityReferenceTest.php
index de77654..9cdafa3 100644
--- a/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermEntityReferenceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/taxonomy/src/Tests/TermIndexTest.php b/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
similarity index 99%
rename from core/modules/taxonomy/src/Tests/TermIndexTest.php
rename to core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
index 28e816c..7516939 100644
--- a/core/modules/taxonomy/src/Tests/TermIndexTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
diff --git a/core/modules/taxonomy/src/Tests/TermLanguageTest.php b/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
similarity index 99%
rename from core/modules/taxonomy/src/Tests/TermLanguageTest.php
rename to core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
index e894ad2..1ab8d48 100644
--- a/core/modules/taxonomy/src/Tests/TermLanguageTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
diff --git a/core/modules/taxonomy/src/Tests/TermTest.php b/core/modules/taxonomy/tests/src/Functional/TermTest.php
similarity index 99%
rename from core/modules/taxonomy/src/Tests/TermTest.php
rename to core/modules/taxonomy/tests/src/Functional/TermTest.php
index 403c28c..f845773 100644
--- a/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Tags;
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php b/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
similarity index 98%
rename from core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
rename to core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
index 18cf720..7ba248a 100644
--- a/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\node\Entity\Node;
 
diff --git a/core/modules/taxonomy/src/Tests/TermTranslationTest.php b/core/modules/taxonomy/tests/src/Functional/TermTranslationTest.php
similarity index 98%
rename from core/modules/taxonomy/src/Tests/TermTranslationTest.php
rename to core/modules/taxonomy/tests/src/Functional/TermTranslationTest.php
index 91b13b1..1935851 100644
--- a/core/modules/taxonomy/src/Tests/TermTranslationTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTranslationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Core\Url;
 use Drupal\system\Tests\Menu\AssertBreadcrumbTrait;
diff --git a/core/modules/taxonomy/src/Tests/TermTranslationUITest.php b/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
similarity index 99%
rename from core/modules/taxonomy/src/Tests/TermTranslationUITest.php
rename to core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
index fa9652d..bef925b 100644
--- a/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\content_translation\Tests\ContentTranslationUITestBase;
 use Drupal\Core\Language\LanguageInterface;
diff --git a/core/modules/taxonomy/src/Tests/ThemeTest.php b/core/modules/taxonomy/tests/src/Functional/ThemeTest.php
similarity index 97%
rename from core/modules/taxonomy/src/Tests/ThemeTest.php
rename to core/modules/taxonomy/tests/src/Functional/ThemeTest.php
index 54ad6e4..d451ecc 100644
--- a/core/modules/taxonomy/src/Tests/ThemeTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/ThemeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 /**
  * Verifies that various taxonomy pages use the expected theme.
diff --git a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php b/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
similarity index 99%
rename from core/modules/taxonomy/src/Tests/TokenReplaceTest.php
rename to core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
index f3c6c5d..1c8b7ea 100644
--- a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Render\BubbleableMetadata;
diff --git a/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php b/core/modules/taxonomy/tests/src/Functional/VocabularyCrudTest.php
similarity index 99%
rename from core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
rename to core/modules/taxonomy/tests/src/Functional/VocabularyCrudTest.php
index 914b7f2..2705ab0 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/VocabularyCrudTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php b/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
similarity index 99%
rename from core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php
rename to core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
index 3326e51..da78589 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\language\Entity\ConfigurableLanguage;
diff --git a/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php b/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
similarity index 99%
rename from core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php
rename to core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
index 9a5e8c0..1b83d84 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 /**
  * Tests the taxonomy vocabulary permissions.
diff --git a/core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php b/core/modules/taxonomy/tests/src/Functional/VocabularyTranslationTest.php
similarity index 97%
rename from core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php
rename to core/modules/taxonomy/tests/src/Functional/VocabularyTranslationTest.php
index 7ad7609..5c41f6c 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/VocabularyTranslationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Unicode;
 
diff --git a/core/modules/taxonomy/src/Tests/VocabularyUiTest.php b/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
similarity index 99%
rename from core/modules/taxonomy/src/Tests/VocabularyUiTest.php
rename to core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
index 76fcac2..88cb49e 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyUiTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 use Drupal\Component\Utility\Unicode;
 
 use Drupal\Core\Url;
diff --git a/core/modules/telephone/src/Tests/TelephoneFieldTest.php b/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
similarity index 95%
rename from core/modules/telephone/src/Tests/TelephoneFieldTest.php
rename to core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
index f7452b0..7f536c4 100644
--- a/core/modules/telephone/src/Tests/TelephoneFieldTest.php
+++ b/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\telephone\Tests;
+namespace Drupal\Tests\telephone\Functional;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group telephone
  */
-class TelephoneFieldTest extends WebTestBase {
+class TelephoneFieldTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/text/src/Tests/TextFieldTest.php b/core/modules/text/tests/src/Functional/TextFieldTest.php
similarity index 99%
rename from core/modules/text/src/Tests/TextFieldTest.php
rename to core/modules/text/tests/src/Functional/TextFieldTest.php
index 993346a..2cee657 100644
--- a/core/modules/text/src/Tests/TextFieldTest.php
+++ b/core/modules/text/tests/src/Functional/TextFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\text\Tests;
+namespace Drupal\Tests\text\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\entity_test\Entity\EntityTest;
diff --git a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php b/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
similarity index 99%
rename from core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
rename to core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
index 56b9d69..7c7dc8a 100644
--- a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
+++ b/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\toolbar\Tests;
+namespace Drupal\Tests\toolbar\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Url;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -25,7 +25,7 @@
  *
  * @group toolbar
  */
-class ToolbarAdminMenuTest extends WebTestBase {
+class ToolbarAdminMenuTest extends BrowserTestBase {
 
   /**
    * A user with permission to access the administrative toolbar.
diff --git a/core/modules/toolbar/src/Tests/ToolbarCacheContextsTest.php b/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php
similarity index 97%
rename from core/modules/toolbar/src/Tests/ToolbarCacheContextsTest.php
rename to core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php
index 6995d59..968e7b8 100644
--- a/core/modules/toolbar/src/Tests/ToolbarCacheContextsTest.php
+++ b/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\toolbar\Tests;
+namespace Drupal\Tests\toolbar\Functional;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 
 
@@ -13,7 +13,7 @@
  *
  * @group toolbar
  */
-class ToolbarCacheContextsTest extends WebTestBase {
+class ToolbarCacheContextsTest extends BrowserTestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
diff --git a/core/modules/toolbar/src/Tests/ToolbarHookToolbarTest.php b/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
similarity index 91%
rename from core/modules/toolbar/src/Tests/ToolbarHookToolbarTest.php
rename to core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
index 7cff043..1bf6e82 100644
--- a/core/modules/toolbar/src/Tests/ToolbarHookToolbarTest.php
+++ b/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\toolbar\Tests;
+namespace Drupal\Tests\toolbar\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the implementation of hook_toolbar() by a module.
  *
  * @group toolbar
  */
-class ToolbarHookToolbarTest extends WebTestBase {
+class ToolbarHookToolbarTest extends BrowserTestBase {
 
   /**
    * A user with permission to access the administrative toolbar.
diff --git a/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php b/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
similarity index 95%
rename from core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php
rename to core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
index 8fa2bed5..ac69865 100644
--- a/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php
+++ b/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\toolbar\Tests;
+namespace Drupal\Tests\toolbar\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that the toolbar icon class remains for translated menu items.
  *
  * @group toolbar
  */
-class ToolbarMenuTranslationTest extends WebTestBase {
+class ToolbarMenuTranslationTest extends BrowserTestBase {
 
   /**
    * A user with permission to access the administrative toolbar.
diff --git a/core/modules/tour/src/Tests/TourCacheTagsTest.php b/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php
similarity index 97%
rename from core/modules/tour/src/Tests/TourCacheTagsTest.php
rename to core/modules/tour/tests/src/Functional/TourCacheTagsTest.php
index 4f2164e..446c33a 100644
--- a/core/modules/tour/src/Tests/TourCacheTagsTest.php
+++ b/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\tour\Tests;
+namespace Drupal\Tests\tour\Functional;
 
 use Drupal\Core\Url;
 use Drupal\system\Tests\Cache\PageCacheTagsTestBase;
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/tracker/src/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
similarity index 95%
rename from core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
rename to core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
index 29492bc..1d33a23 100644
--- a/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
+++ b/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\tracker\Tests;
+namespace Drupal\Tests\tracker\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for private node access on /tracker.
  *
  * @group tracker
  */
-class TrackerNodeAccessTest extends WebTestBase {
+class TrackerNodeAccessTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
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 a927e89..e011364 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,7 +9,7 @@
 use Drupal\Core\Session\AccountInterface;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\Node;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 
 /**
@@ -17,7 +17,7 @@
  *
  * @group tracker
  */
-class TrackerTest extends WebTestBase {
+class TrackerTest extends BrowserTestBase {
 
   use CommentTestTrait;
   use AssertPageCacheContextsAndTagsTrait;
diff --git a/core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php b/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
similarity index 97%
rename from core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php
rename to core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
index 0d0989b..4991a7c 100644
--- a/core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php
+++ b/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\update\Tests;
+namespace Drupal\Tests\update\Functional;
 
 /**
  * Tests the Update Manager module upload via authorize.php functionality.
diff --git a/core/modules/user/src/Tests/RestRegisterUserTest.php b/core/modules/user/tests/src/Functional/RestRegisterUserTest.php
similarity index 99%
rename from core/modules/user/src/Tests/RestRegisterUserTest.php
rename to core/modules/user/tests/src/Functional/RestRegisterUserTest.php
index 62e6bbc..576bd3e 100644
--- a/core/modules/user/src/Tests/RestRegisterUserTest.php
+++ b/core/modules/user/tests/src/Functional/RestRegisterUserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\rest\Tests\RESTTestBase;
 use Drupal\user\Entity\Role;
diff --git a/core/modules/user/src/Tests/UserAccountLinksTest.php b/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserAccountLinksTest.php
rename to core/modules/user/tests/src/Functional/UserAccountLinksTest.php
index 6d7d723..1c65f09 100644
--- a/core/modules/user/src/Tests/UserAccountLinksTest.php
+++ b/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests user-account links.
  *
  * @group user
  */
-class UserAccountLinksTest extends WebTestBase {
+class UserAccountLinksTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserAdminLanguageTest.php b/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
similarity index 98%
rename from core/modules/user/src/Tests/UserAdminLanguageTest.php
rename to core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
index 03baa04..0bbf54a 100644
--- a/core/modules/user/src/Tests/UserAdminLanguageTest.php
+++ b/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests users' ability to change their own administration language.
  *
  * @group user
  */
-class UserAdminLanguageTest extends WebTestBase {
+class UserAdminLanguageTest extends BrowserTestBase {
 
   /**
    * A user with permission to access admin pages and administer languages.
diff --git a/core/modules/user/src/Tests/UserAdminListingTest.php b/core/modules/user/tests/src/Functional/UserAdminListingTest.php
similarity index 96%
rename from core/modules/user/src/Tests/UserAdminListingTest.php
rename to core/modules/user/tests/src/Functional/UserAdminListingTest.php
index 2ca50c8..22b4906 100644
--- a/core/modules/user/src/Tests/UserAdminListingTest.php
+++ b/core/modules/user/tests/src/Functional/UserAdminListingTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -11,7 +11,7 @@
  * @group user
  * @see user_admin_account()
  */
-class UserAdminListingTest extends WebTestBase {
+class UserAdminListingTest extends BrowserTestBase {
 
   /**
    * Tests the listing.
diff --git a/core/modules/user/src/Tests/UserAdminSettingsFormTest.php b/core/modules/user/tests/src/Functional/UserAdminSettingsFormTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserAdminSettingsFormTest.php
rename to core/modules/user/tests/src/Functional/UserAdminSettingsFormTest.php
index 2fba848..8cbdd51 100644
--- a/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
+++ b/core/modules/user/tests/src/Functional/UserAdminSettingsFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\system\Tests\System\SystemConfigFormTestBase;
 use Drupal\user\AccountSettingsForm;
diff --git a/core/modules/user/src/Tests/UserAdminTest.php b/core/modules/user/tests/src/Functional/UserAdminTest.php
similarity index 98%
rename from core/modules/user/src/Tests/UserAdminTest.php
rename to core/modules/user/tests/src/Functional/UserAdminTest.php
index 8d4a22b..0c2aa56 100644
--- a/core/modules/user/src/Tests/UserAdminTest.php
+++ b/core/modules/user/tests/src/Functional/UserAdminTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group user
  */
-class UserAdminTest extends WebTestBase {
+class UserAdminTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserBlocksTest.php b/core/modules/user/tests/src/Functional/UserBlocksTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserBlocksTest.php
rename to core/modules/user/tests/src/Functional/UserBlocksTest.php
index f66007e..d5951bf 100644
--- a/core/modules/user/src/Tests/UserBlocksTest.php
+++ b/core/modules/user/tests/src/Functional/UserBlocksTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests user blocks.
  *
  * @group user
  */
-class UserBlocksTest extends WebTestBase {
+class UserBlocksTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserCacheTagsTest.php b/core/modules/user/tests/src/Functional/UserCacheTagsTest.php
similarity index 96%
rename from core/modules/user/src/Tests/UserCacheTagsTest.php
rename to core/modules/user/tests/src/Functional/UserCacheTagsTest.php
index 8dc7437..d4455ff 100644
--- a/core/modules/user/src/Tests/UserCacheTagsTest.php
+++ b/core/modules/user/tests/src/Functional/UserCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
 use Drupal\user\Entity\Role;
diff --git a/core/modules/user/src/Tests/UserCancelTest.php b/core/modules/user/tests/src/Functional/UserCancelTest.php
similarity index 99%
rename from core/modules/user/src/Tests/UserCancelTest.php
rename to core/modules/user/tests/src/Functional/UserCancelTest.php
index 4ce4d91..36b13c7 100644
--- a/core/modules/user/src/Tests/UserCancelTest.php
+++ b/core/modules/user/tests/src/Functional/UserCancelTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Entity\Comment;
 use Drupal\user\Entity\User;
@@ -13,7 +13,7 @@
  *
  * @group user
  */
-class UserCancelTest extends WebTestBase {
+class UserCancelTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/user/src/Tests/UserCreateFailMailTest.php b/core/modules/user/tests/src/Functional/UserCreateFailMailTest.php
similarity index 90%
rename from core/modules/user/src/Tests/UserCreateFailMailTest.php
rename to core/modules/user/tests/src/Functional/UserCreateFailMailTest.php
index a51229a..d844b0a 100644
--- a/core/modules/user/src/Tests/UserCreateFailMailTest.php
+++ b/core/modules/user/tests/src/Functional/UserCreateFailMailTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the create user administration page.
  *
  * @group user
  */
-class UserCreateFailMailTest extends WebTestBase {
+class UserCreateFailMailTest extends BrowserTestBase {
 
   /**
    * Modules to enable
diff --git a/core/modules/user/src/Tests/UserCreateTest.php b/core/modules/user/tests/src/Functional/UserCreateTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserCreateTest.php
rename to core/modules/user/tests/src/Functional/UserCreateTest.php
index efc7ddf..51cf488 100644
--- a/core/modules/user/src/Tests/UserCreateTest.php
+++ b/core/modules/user/tests/src/Functional/UserCreateTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group user
  */
-class UserCreateTest extends WebTestBase {
+class UserCreateTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserDeleteTest.php b/core/modules/user/tests/src/Functional/UserDeleteTest.php
similarity index 94%
rename from core/modules/user/src/Tests/UserDeleteTest.php
rename to core/modules/user/tests/src/Functional/UserDeleteTest.php
index dbb3002..c82a2f3 100644
--- a/core/modules/user/src/Tests/UserDeleteTest.php
+++ b/core/modules/user/tests/src/Functional/UserDeleteTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group user
  */
-class UserDeleteTest extends WebTestBase {
+class UserDeleteTest extends BrowserTestBase {
 
   /**
    * Test deleting multiple users.
diff --git a/core/modules/user/src/Tests/UserEditTest.php b/core/modules/user/tests/src/Functional/UserEditTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserEditTest.php
rename to core/modules/user/tests/src/Functional/UserEditTest.php
index 225b194..c4b9842 100644
--- a/core/modules/user/src/Tests/UserEditTest.php
+++ b/core/modules/user/tests/src/Functional/UserEditTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests user edit page.
  *
  * @group user
  */
-class UserEditTest extends WebTestBase {
+class UserEditTest extends BrowserTestBase {
 
   /**
    * Test user edit page.
diff --git a/core/modules/user/src/Tests/UserEditedOwnAccountTest.php b/core/modules/user/tests/src/Functional/UserEditedOwnAccountTest.php
similarity index 87%
rename from core/modules/user/src/Tests/UserEditedOwnAccountTest.php
rename to core/modules/user/tests/src/Functional/UserEditedOwnAccountTest.php
index 6c058bf..7783eb9 100644
--- a/core/modules/user/src/Tests/UserEditedOwnAccountTest.php
+++ b/core/modules/user/tests/src/Functional/UserEditedOwnAccountTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests user edited own account can still log in.
  *
  * @group user
  */
-class UserEditedOwnAccountTest extends WebTestBase {
+class UserEditedOwnAccountTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserEntityCallbacksTest.php b/core/modules/user/tests/src/Functional/UserEntityCallbacksTest.php
similarity index 93%
rename from core/modules/user/src/Tests/UserEntityCallbacksTest.php
rename to core/modules/user/tests/src/Functional/UserEntityCallbacksTest.php
index 944b352..ceb8eda 100644
--- a/core/modules/user/src/Tests/UserEntityCallbacksTest.php
+++ b/core/modules/user/tests/src/Functional/UserEntityCallbacksTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group user
  */
-class UserEntityCallbacksTest extends WebTestBase {
+class UserEntityCallbacksTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserLanguageCreationTest.php b/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
similarity index 96%
rename from core/modules/user/src/Tests/UserLanguageCreationTest.php
rename to core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
index 08ca707..072e73c 100644
--- a/core/modules/user/src/Tests/UserLanguageCreationTest.php
+++ b/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests whether proper language is stored for new users and access to language
@@ -11,7 +11,7 @@
  *
  * @group user
  */
-class UserLanguageCreationTest extends WebTestBase {
+class UserLanguageCreationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserLanguageTest.php b/core/modules/user/tests/src/Functional/UserLanguageTest.php
similarity index 94%
rename from core/modules/user/src/Tests/UserLanguageTest.php
rename to core/modules/user/tests/src/Functional/UserLanguageTest.php
index 5c5f73f..e4aeb58 100644
--- a/core/modules/user/src/Tests/UserLanguageTest.php
+++ b/core/modules/user/tests/src/Functional/UserLanguageTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Functional tests for a user's ability to change their default language.
  *
  * @group user
  */
-class UserLanguageTest extends WebTestBase {
+class UserLanguageTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserLoginTest.php b/core/modules/user/tests/src/Functional/UserLoginTest.php
similarity index 98%
rename from core/modules/user/src/Tests/UserLoginTest.php
rename to core/modules/user/tests/src/Functional/UserLoginTest.php
index af00c74..f3f2b78 100644
--- a/core/modules/user/src/Tests/UserLoginTest.php
+++ b/core/modules/user/tests/src/Functional/UserLoginTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group user
  */
-class UserLoginTest extends WebTestBase {
+class UserLoginTest extends BrowserTestBase {
 
   /**
    * Tests login with destination.
diff --git a/core/modules/user/src/Tests/UserMailNotifyTest.php b/core/modules/user/tests/src/Functional/UserMailNotifyTest.php
similarity index 98%
rename from core/modules/user/src/Tests/UserMailNotifyTest.php
rename to core/modules/user/tests/src/Functional/UserMailNotifyTest.php
index 9943c5b..7f5257a 100644
--- a/core/modules/user/src/Tests/UserMailNotifyTest.php
+++ b/core/modules/user/tests/src/Functional/UserMailNotifyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Core\Test\AssertMailTrait;
 use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
similarity index 99%
rename from core/modules/user/src/Tests/UserPasswordResetTest.php
rename to core/modules/user/tests/src/Functional/UserPasswordResetTest.php
index c012e9f..118edc5 100644
--- a/core/modules/user/src/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Url;
diff --git a/core/modules/user/src/Tests/UserPermissionsTest.php b/core/modules/user/tests/src/Functional/UserPermissionsTest.php
similarity index 98%
rename from core/modules/user/src/Tests/UserPermissionsTest.php
rename to core/modules/user/tests/src/Functional/UserPermissionsTest.php
index 5e3ecd5..9647816 100644
--- a/core/modules/user/src/Tests/UserPermissionsTest.php
+++ b/core/modules/user/tests/src/Functional/UserPermissionsTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 use Drupal\user\Entity\Role;
 
@@ -12,7 +12,7 @@
  *
  * @group user
  */
-class UserPermissionsTest extends WebTestBase {
+class UserPermissionsTest extends BrowserTestBase {
 
   /**
    * User with admin privileges.
diff --git a/core/modules/user/src/Tests/UserPictureTest.php b/core/modules/user/tests/src/Functional/UserPictureTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserPictureTest.php
rename to core/modules/user/tests/src/Functional/UserPictureTest.php
index 3f8db42..e7f505c 100644
--- a/core/modules/user/src/Tests/UserPictureTest.php
+++ b/core/modules/user/tests/src/Functional/UserPictureTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\image\Entity\ImageStyle;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\file\Entity\File;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group user
  */
-class UserPictureTest extends WebTestBase {
+class UserPictureTest extends BrowserTestBase {
 
   /**
    * The profile to install as a basis for testing.
diff --git a/core/modules/user/src/Tests/UserRegistrationTest.php b/core/modules/user/tests/src/Functional/UserRegistrationTest.php
similarity index 99%
rename from core/modules/user/src/Tests/UserRegistrationTest.php
rename to core/modules/user/tests/src/Functional/UserRegistrationTest.php
index 0831362..6bedcf9 100644
--- a/core/modules/user/src/Tests/UserRegistrationTest.php
+++ b/core/modules/user/tests/src/Functional/UserRegistrationTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests registration of user under different configurations.
  *
  * @group user
  */
-class UserRegistrationTest extends WebTestBase {
+class UserRegistrationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserRoleAdminTest.php b/core/modules/user/tests/src/Functional/UserRoleAdminTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserRoleAdminTest.php
rename to core/modules/user/tests/src/Functional/UserRoleAdminTest.php
index 182da93..1d5dda9 100644
--- a/core/modules/user/src/Tests/UserRoleAdminTest.php
+++ b/core/modules/user/tests/src/Functional/UserRoleAdminTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\Role;
 use Drupal\user\RoleInterface;
 
@@ -11,7 +11,7 @@
  *
  * @group user
  */
-class UserRoleAdminTest extends WebTestBase {
+class UserRoleAdminTest extends BrowserTestBase {
 
   /**
    * User with admin privileges.
diff --git a/core/modules/user/src/Tests/UserRolesAssignmentTest.php b/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
similarity index 96%
rename from core/modules/user/src/Tests/UserRolesAssignmentTest.php
rename to core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
index 485bd2f..1701b0f 100644
--- a/core/modules/user/src/Tests/UserRolesAssignmentTest.php
+++ b/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that users can be assigned and unassigned roles.
  *
  * @group user
  */
-class UserRolesAssignmentTest extends WebTestBase {
+class UserRolesAssignmentTest extends BrowserTestBase {
 
   protected function setUp() {
     parent::setUp();
diff --git a/core/modules/user/src/Tests/UserSaveTest.php b/core/modules/user/tests/src/Functional/UserSaveTest.php
similarity index 92%
rename from core/modules/user/src/Tests/UserSaveTest.php
rename to core/modules/user/tests/src/Functional/UserSaveTest.php
index 6a454ee..3428749 100644
--- a/core/modules/user/src/Tests/UserSaveTest.php
+++ b/core/modules/user/tests/src/Functional/UserSaveTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -10,7 +10,7 @@
  *
  * @group user
  */
-class UserSaveTest extends WebTestBase {
+class UserSaveTest extends BrowserTestBase {
 
   /**
    * Test creating a user with arbitrary uid.
diff --git a/core/modules/user/src/Tests/UserSearchTest.php b/core/modules/user/tests/src/Functional/UserSearchTest.php
similarity index 97%
rename from core/modules/user/src/Tests/UserSearchTest.php
rename to core/modules/user/tests/src/Functional/UserSearchTest.php
index d154030..af2fb28 100644
--- a/core/modules/user/src/Tests/UserSearchTest.php
+++ b/core/modules/user/tests/src/Functional/UserSearchTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the user search page and verifies that sensitive information is hidden
@@ -10,7 +10,7 @@
  *
  * @group user
  */
-class UserSearchTest extends WebTestBase {
+class UserSearchTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserTimeZoneTest.php b/core/modules/user/tests/src/Functional/UserTimeZoneTest.php
similarity index 96%
rename from core/modules/user/src/Tests/UserTimeZoneTest.php
rename to core/modules/user/tests/src/Functional/UserTimeZoneTest.php
index 3229d31..cfa8965 100644
--- a/core/modules/user/src/Tests/UserTimeZoneTest.php
+++ b/core/modules/user/tests/src/Functional/UserTimeZoneTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Core\Datetime\Entity\DateFormat;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Set a user time zone and verify that dates are displayed in local time.
  *
  * @group user
  */
-class UserTimeZoneTest extends WebTestBase {
+class UserTimeZoneTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserTokenReplaceTest.php b/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
similarity index 98%
rename from core/modules/user/src/Tests/UserTokenReplaceTest.php
rename to core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
index b8cfde0..869339a 100644
--- a/core/modules/user/src/Tests/UserTokenReplaceTest.php
+++ b/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -14,7 +14,7 @@
  *
  * @group user
  */
-class UserTokenReplaceTest extends WebTestBase {
+class UserTokenReplaceTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/user/src/Tests/UserTranslationUITest.php b/core/modules/user/tests/src/Functional/UserTranslationUITest.php
similarity index 98%
rename from core/modules/user/src/Tests/UserTranslationUITest.php
rename to core/modules/user/tests/src/Functional/UserTranslationUITest.php
index 82a3445..e64bed8 100644
--- a/core/modules/user/src/Tests/UserTranslationUITest.php
+++ b/core/modules/user/tests/src/Functional/UserTranslationUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\content_translation\Tests\ContentTranslationUITestBase;