diff --git a/browsertest-convert.php b/browsertest-convert.php
index cef3245..6869330 100644
--- a/browsertest-convert.php
+++ b/browsertest-convert.php
@@ -111,6 +111,8 @@
   'SearchMultilingualTest',
   // https://www.drupal.org/node/2795071
   'NodeAccessBaseTableTest',
+  'BlockTest',
+
   // @todo ... there are more
 
   // https://www.drupal.org/node/2795073
@@ -148,13 +150,56 @@
   'UpdateUploadTest',
   'UserPasswordResetTest',
   'UserPictureTest',
-
+  // https://www.drupal.org/node/2795085
+  'BlockInstallTest',
+  'PageCacheTest',
+  'SearchPageCacheTagsTest',
+  'EarlyRenderingControllerTest',
+
+  // https://www.drupal.org/node/2795093
+  'CKEditorAdminTest',
+  'CommentPagerTest',
+  'ConfigEntityTest',
+  'DateTimeFieldTest',
+  'DateRangeFieldTest',
+  'EditorAdminTest',
+  'BooleanFieldTest',
+  'BooleanFormatterSettingsTest',
+  'EntityReferenceAdminTest',
+  'NumberFieldTest',
+  'FormTest',
+  'NestedFormTest',
+  'ManageDisplayTest',
+  'FileFieldWidgetTest',
+  'FileManagedFileElementTest',
+  'ImageAdminStylesTest',
+  'ImageFieldDisplayTest',
+  'ResponsiveImageFieldUiTest',
+  'WebTestBase',
+  'AjaxFormCacheTest',
+  'AjaxFormPageCacheTest',
+  'AjaxInGroupTest',
+  'CommandsTest',
+  'DialogTest',
+  'ElementValidationTest',
+  'FormValuesTest',
+  'FrameworkTest',
+  'MultiFormTest',
+  'ElementsTableSelectTest',
+  'RebuildTest',
+  'UserPasswordResetTest',
+  'UserRegistrationTest',
+  'BasicTest',
+  'PreviewTest',
+  'RowUITest',
 
   // Exclude update tests, they are their own beast.
   'Update',
   // Exclude views, as their test base needs adaption.
   'views',
   'views_ui',
+  // Exclude big_pipe, because its doing curl magic
+  'big_pipe',
 ];
 
 function isTestExcluded($test_name, array $excluded_tests) {
diff --git a/core/modules/big_pipe/tests/src/Functional/BigPipePlaceholderTestCases.php b/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
similarity index 99%
rename from core/modules/big_pipe/tests/src/Functional/BigPipePlaceholderTestCases.php
rename to core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
index 48789e9..102b718 100644
--- a/core/modules/big_pipe/tests/src/Functional/BigPipePlaceholderTestCases.php
+++ b/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\big_pipe\Unit\Render\Placeholder\BigPipePlaceholderTestCases.
  */
 
-namespace Drupal\Tests\big_pipe\Functional;
+namespace Drupal\big_pipe\Tests;
 
 use Drupal\big_pipe\Render\BigPipeMarkup;
 use Drupal\Core\Session\AccountInterface;
diff --git a/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php b/core/modules/big_pipe/src/Tests/BigPipeTest.php
similarity index 99%
rename from core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
rename to core/modules/big_pipe/src/Tests/BigPipeTest.php
index 1708f63..a3f773e 100644
--- a/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
+++ b/core/modules/big_pipe/src/Tests/BigPipeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\big_pipe\Functional;
+namespace Drupal\big_pipe\Tests;
 
 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\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests BigPipe's no-JS detection & response delivery (with and without JS).
@@ -21,7 +21,7 @@
  *
  * @group big_pipe
  */
-class BigPipeTest extends BrowserTestBase {
+class BigPipeTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php b/core/modules/block/src/Tests/BlockFormInBlockTest.php
similarity index 93%
rename from core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
rename to core/modules/block/src/Tests/BlockFormInBlockTest.php
index 9ddcd34..20d24b2 100644
--- a/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
+++ b/core/modules/block/src/Tests/BlockFormInBlockTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\Tests\block\Functional;
+namespace Drupal\block\Tests;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests form in block caching.
  *
  * @group block
  */
-class BlockFormInBlockTest extends BrowserTestBase {
+class BlockFormInBlockTest extends WebTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/block/tests/src/Functional/BlockInstallTest.php b/core/modules/block/src/Tests/BlockInstallTest.php
similarity index 87%
rename from core/modules/block/tests/src/Functional/BlockInstallTest.php
rename to core/modules/block/src/Tests/BlockInstallTest.php
index c6fd1eb..55f4b8a 100644
--- a/core/modules/block/tests/src/Functional/BlockInstallTest.php
+++ b/core/modules/block/src/Tests/BlockInstallTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\Tests\block\Functional;
+namespace Drupal\block\Tests;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests block module's installation.
  *
  * @group block
  */
-class BlockInstallTest extends BrowserTestBase {
+class BlockInstallTest extends WebTestBase {
 
   public function testCacheTagInvalidationUponInstallation() {
     // Warm the page cache.
diff --git a/core/modules/block/tests/src/Functional/BlockTest.php b/core/modules/block/src/Tests/BlockTest.php
similarity index 99%
rename from core/modules/block/tests/src/Functional/BlockTest.php
rename to core/modules/block/src/Tests/BlockTest.php
index 621d40e..f5924ca 100644
--- a/core/modules/block/tests/src/Functional/BlockTest.php
+++ b/core/modules/block/src/Tests/BlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\block\Functional;
+namespace Drupal\block\Tests;
 
 use Drupal\Component\Utility\Html;
 use Drupal\block\Entity\Block;
diff --git a/core/modules/block/tests/src/Functional/BlockTestBase.php b/core/modules/block/tests/src/Functional/BlockTestBase.php
deleted file mode 100644
index 110e317..0000000
--- a/core/modules/block/tests/src/Functional/BlockTestBase.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Drupal\Tests\block\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-use Drupal\filter\Entity\FilterFormat;
-
-/**
- * Provides setup and helper methods for block module tests.
- */
-abstract class BlockTestBase extends BrowserTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('block', 'filter', 'test_page_test', 'help', 'block_test');
-
-  /**
-   * A list of theme regions to test.
-   *
-   * @var array
-   */
-  protected $regions;
-
-  /**
-   * A test user with administrative privileges.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Use the test page as the front page.
-    $this->config('system.site')->set('page.front', '/test-page')->save();
-
-    // Create Full HTML text format.
-    $full_html_format = FilterFormat::create(array(
-      'format' => 'full_html',
-      'name' => 'Full HTML',
-    ));
-    $full_html_format->save();
-
-    // Create and log in an administrative user having access to the Full HTML
-    // text format.
-    $this->adminUser = $this->drupalCreateUser(array(
-      'administer blocks',
-      $full_html_format->getPermissionName(),
-      'access administration pages',
-    ));
-    $this->drupalLogin($this->adminUser);
-
-    // Define the existing regions.
-    $this->regions = array(
-      'header',
-      'sidebar_first',
-      'content',
-      'sidebar_second',
-      'footer',
-    );
-    $block_storage = $this->container->get('entity_type.manager')->getStorage('block');
-    $blocks = $block_storage->loadByProperties(array('theme' => $this->config('system.theme')->get('default')));
-    foreach ($blocks as $block) {
-      $block->delete();
-    }
-  }
-
-}
diff --git a/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
similarity index 99%
rename from core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
rename to core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
index e101799..d10180d 100644
--- a/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\Tests\ckeditor\Functional;
+namespace Drupal\ckeditor\Tests;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\editor\Entity\Editor;
 use Drupal\filter\FilterFormatInterface;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -13,7 +13,7 @@
  *
  * @group ckeditor
  */
-class CKEditorAdminTest extends BrowserTestBase {
+class CKEditorAdminTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/comment/tests/src/Functional/CommentBlockTest.php b/core/modules/comment/src/Tests/CommentBlockTest.php
similarity index 98%
rename from core/modules/comment/tests/src/Functional/CommentBlockTest.php
rename to core/modules/comment/src/Tests/CommentBlockTest.php
index e7e347b..de92238 100644
--- a/core/modules/comment/tests/src/Functional/CommentBlockTest.php
+++ b/core/modules/comment/src/Tests/CommentBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\comment\Functional;
+namespace Drupal\comment\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\user\RoleInterface;
diff --git a/core/modules/comment/tests/src/Functional/CommentPagerTest.php b/core/modules/comment/src/Tests/CommentPagerTest.php
similarity index 99%
rename from core/modules/comment/tests/src/Functional/CommentPagerTest.php
rename to core/modules/comment/src/Tests/CommentPagerTest.php
index 385aa34..aa7d099 100644
--- a/core/modules/comment/tests/src/Functional/CommentPagerTest.php
+++ b/core/modules/comment/src/Tests/CommentPagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\comment\Functional;
+namespace Drupal\comment\Tests;
 
 use Drupal\comment\CommentManagerInterface;
 use Drupal\Component\Utility\SafeMarkup;
diff --git a/core/modules/config/tests/src/Functional/ConfigEntityTest.php b/core/modules/config/src/Tests/ConfigEntityTest.php
similarity index 99%
rename from core/modules/config/tests/src/Functional/ConfigEntityTest.php
rename to core/modules/config/src/Tests/ConfigEntityTest.php
index 33f0ee1..a8a8f0f 100644
--- a/core/modules/config/tests/src/Functional/ConfigEntityTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\config\Functional;
+namespace Drupal\config\Tests;
 
 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\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests configuration entities.
  *
  * @group config
  */
-class ConfigEntityTest extends BrowserTestBase {
+class ConfigEntityTest extends WebTestBase {
 
   /**
    * The maximum length for the entity storage used in this test.
diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationFormTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
similarity index 92%
rename from core/modules/config_translation/tests/src/Functional/ConfigTranslationFormTest.php
rename to core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
index d787141..648f047 100644
--- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationFormTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\Tests\config_translation\Functional;
+namespace Drupal\config_translation\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests for altering configuration translation forms.
  *
  * @group config_translation
  */
-class ConfigTranslationFormTest extends BrowserTestBase {
+class ConfigTranslationFormTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php b/core/modules/content_moderation/src/Tests/ModerationFormTest.php
similarity index 98%
rename from core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
rename to core/modules/content_moderation/src/Tests/ModerationFormTest.php
index f41b500..d6c92b9 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
+++ b/core/modules/content_moderation/src/Tests/ModerationFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\content_moderation\Functional;
+namespace Drupal\content_moderation\Tests;
 
 /**
  * Tests the moderation form, specifically on nodes.
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php b/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
similarity index 98%
rename from core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
rename to core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
index 81014b0..03a4b0e 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
+++ b/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\content_moderation\Functional;
+namespace Drupal\content_moderation\Tests;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
diff --git a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
similarity index 99%
rename from core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
rename to core/modules/datetime/src/Tests/DateTimeFieldTest.php
index ce3bad1..c729b23 100644
--- a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\datetime\Functional;
+namespace Drupal\datetime\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php b/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
similarity index 99%
rename from core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
rename to core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
index b5a64d1..2afb5f5 100644
--- a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
+++ b/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\datetime_range\Functional;
+namespace Drupal\datetime_range\Tests;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/editor/tests/src/Functional/EditorAdminTest.php b/core/modules/editor/src/Tests/EditorAdminTest.php
similarity index 98%
rename from core/modules/editor/tests/src/Functional/EditorAdminTest.php
rename to core/modules/editor/src/Tests/EditorAdminTest.php
index 8ac2459..97d47b1 100644
--- a/core/modules/editor/tests/src/Functional/EditorAdminTest.php
+++ b/core/modules/editor/src/Tests/EditorAdminTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\Tests\editor\Functional;
+namespace Drupal\editor\Tests;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests administration of text editors.
  *
  * @group editor
  */
-class EditorAdminTest extends BrowserTestBase {
+class EditorAdminTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field/tests/src/Functional/FormTest.php b/core/modules/field/src/Tests/FormTest.php
similarity index 99%
rename from core/modules/field/tests/src/Functional/FormTest.php
rename to core/modules/field/src/Tests/FormTest.php
index b1a434d..16625a9 100644
--- a/core/modules/field/tests/src/Functional/FormTest.php
+++ b/core/modules/field/src/Tests/FormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\field\Functional;
+namespace Drupal\field\Tests;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
diff --git a/core/modules/field/tests/src/Functional/NestedFormTest.php b/core/modules/field/src/Tests/NestedFormTest.php
similarity index 99%
rename from core/modules/field/tests/src/Functional/NestedFormTest.php
rename to core/modules/field/src/Tests/NestedFormTest.php
index 232fa8e..28dbe55 100644
--- a/core/modules/field/tests/src/Functional/NestedFormTest.php
+++ b/core/modules/field/src/Tests/NestedFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\field\Functional;
+namespace Drupal\field\Tests;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
diff --git a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php
similarity index 99%
rename from core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
rename to core/modules/file/src/Tests/FileFieldWidgetTest.php
index 799d358..414c86b 100644
--- a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
+++ b/core/modules/file/src/Tests/FileFieldWidgetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\file\Functional;
+namespace Drupal\file\Tests;
 
 use Drupal\comment\Entity\Comment;
 use Drupal\comment\Tests\CommentTestTrait;
diff --git a/core/modules/file/tests/src/Functional/FileManagedFileElementTest.php b/core/modules/file/src/Tests/FileManagedFileElementTest.php
similarity index 99%
rename from core/modules/file/tests/src/Functional/FileManagedFileElementTest.php
rename to core/modules/file/src/Tests/FileManagedFileElementTest.php
index b75193f..07102a0 100644
--- a/core/modules/file/tests/src/Functional/FileManagedFileElementTest.php
+++ b/core/modules/file/src/Tests/FileManagedFileElementTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\file\Functional;
+namespace Drupal\file\Tests;
 
 /**
  * Tests the 'managed_file' element type.
diff --git a/core/modules/filter/tests/src/Functional/FilterFormTest.php b/core/modules/filter/src/Tests/FilterFormTest.php
similarity index 99%
rename from core/modules/filter/tests/src/Functional/FilterFormTest.php
rename to core/modules/filter/src/Tests/FilterFormTest.php
index 9a16f0f..24bbc15 100644
--- a/core/modules/filter/tests/src/Functional/FilterFormTest.php
+++ b/core/modules/filter/src/Tests/FilterFormTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\Tests\filter\Functional;
+namespace Drupal\filter\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests form elements with associated text formats.
  *
  * @group filter
  */
-class FilterFormTest extends BrowserTestBase {
+class FilterFormTest extends WebTestBase {
 
   /**
    * Modules to enable for this test.
diff --git a/core/modules/forum/tests/src/Functional/ForumBlockTest.php b/core/modules/forum/src/Tests/ForumBlockTest.php
similarity index 97%
rename from core/modules/forum/tests/src/Functional/ForumBlockTest.php
rename to core/modules/forum/src/Tests/ForumBlockTest.php
index 2f67cd4..1bcc9bc 100644
--- a/core/modules/forum/tests/src/Functional/ForumBlockTest.php
+++ b/core/modules/forum/src/Tests/ForumBlockTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Tests\forum\Functional;
+namespace Drupal\forum\Tests;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\comment\Entity\Comment;
 
@@ -11,7 +11,7 @@
  *
  * @group forum
  */
-class ForumBlockTest extends BrowserTestBase {
+class ForumBlockTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/language/tests/src/Functional/EntityTypeWithoutLanguageFormTest.php b/core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php
similarity index 87%
rename from core/modules/language/tests/src/Functional/EntityTypeWithoutLanguageFormTest.php
rename to core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php
index 14d5473..20a3532 100644
--- a/core/modules/language/tests/src/Functional/EntityTypeWithoutLanguageFormTest.php
+++ b/core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\Tests\language\Functional;
+namespace Drupal\language\Tests;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests entity type without language support.
@@ -12,7 +12,7 @@
  *
  * @group language
  */
-class EntityTypeWithoutLanguageFormTest extends BrowserTestBase {
+class EntityTypeWithoutLanguageFormTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php b/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
similarity index 91%
rename from core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php
rename to core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
index 70d4976..1e41755 100644
--- a/core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php
+++ b/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\Tests\locale\Functional;
+namespace Drupal\locale\Tests;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests the locale functionality in the altered file settings form.
  *
  * @group locale
  */
-class LocaleFileSystemFormTest extends BrowserTestBase {
+class LocaleFileSystemFormTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
similarity index 91%
rename from core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
rename to core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
index 6a51fd2..e6ec76e 100644
--- a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\menu_link_content\Functional;
+namespace Drupal\menu_link_content\Tests;
 
 use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\system\Entity\Menu;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group Menu
  */
-class MenuLinkContentDeleteFormTest extends BrowserTestBase {
+class MenuLinkContentDeleteFormTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
similarity index 91%
rename from core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
rename to core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
index 0b992cf..1bdc927 100644
--- a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\Tests\menu_link_content\Functional;
+namespace Drupal\menu_link_content\Tests;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests the menu link content UI.
  *
  * @group Menu
  */
-class MenuLinkContentFormTest extends BrowserTestBase {
+class MenuLinkContentFormTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/menu_ui/tests/src/Functional/MenuWebTestBase.php b/core/modules/menu_ui/tests/src/Functional/MenuWebTestBase.php
deleted file mode 100644
index e25038d..0000000
--- a/core/modules/menu_ui/tests/src/Functional/MenuWebTestBase.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Drupal\Tests\menu_ui\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Base class for menu web tests.
- */
-abstract class MenuWebTestBase extends BrowserTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('menu_ui', 'menu_link_content');
-
-  /**
-   * Fetches the menu item from the database and compares it to expected item.
-   *
-   * @param int $menu_plugin_id
-   *   Menu item id.
-   * @param array $expected_item
-   *   Array containing properties to verify.
-   */
-  function assertMenuLink($menu_plugin_id, array $expected_item) {
-    // Retrieve menu link.
-    /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
-    $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-    $menu_link_manager->resetDefinitions();
-    // Reset the static load cache.
-    \Drupal::entityManager()->getStorage('menu_link_content')->resetCache();
-    $definition = $menu_link_manager->getDefinition($menu_plugin_id);
-
-    $entity = NULL;
-
-    // Pull the path from the menu link content.
-    if (strpos($menu_plugin_id, 'menu_link_content') === 0) {
-      list(, $uuid) = explode(':', $menu_plugin_id, 2);
-      /** @var \Drupal\menu_link_content\Entity\MenuLinkContent $entity */
-      $entity = \Drupal::entityManager()->loadEntityByUuid('menu_link_content', $uuid);
-    }
-
-    if (isset($expected_item['children'])) {
-      $child_ids = array_values($menu_link_manager->getChildIds($menu_plugin_id));
-      sort($expected_item['children']);
-      if ($child_ids) {
-        sort($child_ids);
-      }
-      $this->assertEqual($expected_item['children'], $child_ids);
-      unset($expected_item['children']);
-    }
-
-    if (isset($expected_item['parents'])) {
-      $parent_ids = array_values($menu_link_manager->getParentIds($menu_plugin_id));
-      $this->assertEqual($expected_item['parents'], $parent_ids);
-      unset($expected_item['parents']);
-    }
-
-    if (isset($expected_item['langcode']) && $entity) {
-      $this->assertEqual($entity->langcode->value, $expected_item['langcode']);
-      unset($expected_item['langcode']);
-    }
-
-    if (isset($expected_item['enabled']) && $entity) {
-      $this->assertEqual($entity->enabled->value, $expected_item['enabled']);
-      unset($expected_item['enabled']);
-    }
-
-    foreach ($expected_item as $key => $value) {
-      $this->assertTrue(isset($definition[$key]));
-      $this->assertEqual($definition[$key], $value);
-    }
-  }
-
-}
diff --git a/core/modules/node/tests/src/Functional/NodeEditFormTest.php b/core/modules/node/src/Tests/NodeEditFormTest.php
similarity index 99%
rename from core/modules/node/tests/src/Functional/NodeEditFormTest.php
rename to core/modules/node/src/Tests/NodeEditFormTest.php
index cc12dbc..b154ca0 100644
--- a/core/modules/node/tests/src/Functional/NodeEditFormTest.php
+++ b/core/modules/node/src/Tests/NodeEditFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\node\Functional;
+namespace Drupal\node\Tests;
 
 use Drupal\node\NodeInterface;
 use Drupal\user\Entity\User;
diff --git a/core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php b/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
similarity index 95%
rename from core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php
rename to core/modules/node/src/Tests/NodeSyndicateBlockTest.php
index 2f43843..31b216f 100644
--- a/core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php
+++ b/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\node\Functional;
+namespace Drupal\node\Tests;
 
 /**
  * Tests if the syndicate block is available.
diff --git a/core/modules/page_cache/tests/src/Functional/PageCacheTest.php b/core/modules/page_cache/src/Tests/PageCacheTest.php
similarity index 99%
rename from core/modules/page_cache/tests/src/Functional/PageCacheTest.php
rename to core/modules/page_cache/src/Tests/PageCacheTest.php
index 981de94..22b8b51 100644
--- a/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\Tests\page_cache\Functional;
+namespace Drupal\page_cache\Tests;
 
 use Drupal\Component\Datetime\DateTimePlus;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Url;
 use Drupal\entity_test\Entity\EntityTest;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\Core\Cache\Cache;
 use Drupal\user\RoleInterface;
 
@@ -15,7 +15,7 @@
  *
  * @group page_cache
  */
-class PageCacheTest extends BrowserTestBase {
+class PageCacheTest extends WebTestBase {
 
   protected $dumpHeaders = TRUE;
 
diff --git a/core/modules/path/tests/src/Functional/PathNodeFormTest.php b/core/modules/path/src/Tests/PathNodeFormTest.php
similarity index 96%
rename from core/modules/path/tests/src/Functional/PathNodeFormTest.php
rename to core/modules/path/src/Tests/PathNodeFormTest.php
index fec8979..79b43a7 100644
--- a/core/modules/path/tests/src/Functional/PathNodeFormTest.php
+++ b/core/modules/path/src/Tests/PathNodeFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\path\Functional;
+namespace Drupal\path\Tests;
 
 /**
  * Tests the Path Node form UI.
diff --git a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldUiTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
similarity index 97%
rename from core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldUiTest.php
rename to core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
index 055b74e..8b1030f 100644
--- a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldUiTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\responsive_image\Functional;
+namespace Drupal\responsive_image\Tests;
 
 
 use Drupal\field_ui\Tests\FieldUiTestTrait;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\responsive_image\Entity\ResponsiveImageStyle;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group responsive_image
  */
-class ResponsiveImageFieldUiTest extends BrowserTestBase {
+class ResponsiveImageFieldUiTest extends WebTestBase {
 
   use FieldUiTestTrait;
 
diff --git a/core/modules/rest/tests/src/Functional/PageCacheTest.php b/core/modules/rest/src/Tests/PageCacheTest.php
similarity index 99%
rename from core/modules/rest/tests/src/Functional/PageCacheTest.php
rename to core/modules/rest/src/Tests/PageCacheTest.php
index e04c00a..66e57f5 100644
--- a/core/modules/rest/tests/src/Functional/PageCacheTest.php
+++ b/core/modules/rest/src/Tests/PageCacheTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional;
+namespace Drupal\rest\Tests;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Url;
diff --git a/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php b/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
similarity index 99%
rename from core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
rename to core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
index 880522a..9bd13bd 100644
--- a/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
+++ b/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\search\Tests;
 
 /**
  * Indexes content and tests the advanced search form.
diff --git a/core/modules/search/tests/src/Functional/SearchBlockTest.php b/core/modules/search/src/Tests/SearchBlockTest.php
similarity index 99%
rename from core/modules/search/tests/src/Functional/SearchBlockTest.php
rename to core/modules/search/src/Tests/SearchBlockTest.php
index 1b670e3..7d42a85 100644
--- a/core/modules/search/tests/src/Functional/SearchBlockTest.php
+++ b/core/modules/search/src/Tests/SearchBlockTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\search\Tests;
 
 /**
  * Tests if the search form block is available.
diff --git a/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php b/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
similarity index 99%
rename from core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
rename to core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
index 105e88e..9ca87d6 100644
--- a/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
+++ b/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\search\Tests;
 
 use Drupal\Core\Url;
 use Drupal\search\Entity\SearchPage;
diff --git a/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php b/core/modules/search/src/Tests/SearchEmbedFormTest.php
similarity index 98%
rename from core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
rename to core/modules/search/src/Tests/SearchEmbedFormTest.php
index 735afd6..22da9b6 100644
--- a/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
+++ b/core/modules/search/src/Tests/SearchEmbedFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\search\Tests;
 
 /**
  * Verifies that a form embedded in search results works.
diff --git a/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php b/core/modules/search/src/Tests/SearchPageCacheTagsTest.php
similarity index 99%
rename from core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php
rename to core/modules/search/src/Tests/SearchPageCacheTagsTest.php
index d05c83f..3a7bc67 100644
--- a/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php
+++ b/core/modules/search/src/Tests/SearchPageCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\search\Tests;
 
 use Drupal\Core\Cache\Cache;
 
diff --git a/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php b/core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php
similarity index 97%
rename from core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
rename to core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php
index 4991a7c..0d0989b 100644
--- a/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
+++ b/core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\update\Functional;
+namespace Drupal\update\Tests;
 
 /**
  * Tests the Update Manager module upload via authorize.php functionality.
diff --git a/core/modules/user/tests/src/Functional/UserAdminSettingsFormTest.php b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
similarity index 97%
rename from core/modules/user/tests/src/Functional/UserAdminSettingsFormTest.php
rename to core/modules/user/src/Tests/UserAdminSettingsFormTest.php
index 8cbdd51..2fba848 100644
--- a/core/modules/user/tests/src/Functional/UserAdminSettingsFormTest.php
+++ b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\user\Functional;
+namespace Drupal\user\Tests;
 
 use Drupal\system\Tests\System\SystemConfigFormTestBase;
 use Drupal\user\AccountSettingsForm;
diff --git a/core/modules/user/tests/src/Functional/UserRegistrationTest.php b/core/modules/user/src/Tests/UserRegistrationTest.php
similarity index 99%
rename from core/modules/user/tests/src/Functional/UserRegistrationTest.php
rename to core/modules/user/src/Tests/UserRegistrationTest.php
index 6bedcf9..0831362 100644
--- a/core/modules/user/tests/src/Functional/UserRegistrationTest.php
+++ b/core/modules/user/src/Tests/UserRegistrationTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Drupal\Tests\user\Functional;
+namespace Drupal\user\Tests;
 
 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\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests registration of user under different configurations.
  *
  * @group user
  */
-class UserRegistrationTest extends BrowserTestBase {
+class UserRegistrationTest extends WebTestBase {
 
   /**
    * Modules to enable.