diff --git a/browsertest-convert.php b/browsertest-convert.php
index 1798872..cef3245 100644
--- a/browsertest-convert.php
+++ b/browsertest-convert.php
@@ -94,6 +94,61 @@
   'QuickEditAutocompleteTermTest',
   'QuickEditLoadingTest',
   'DisplayTest',
+  // https://www.drupal.org/node/2795037
+  'AggregatorCronTest',
+  'FeedLanguageTest',
+  'DbLogTest',
+  'reEnableModuleFieldTest',
+  'LocaleUpdateCronTest',
+  'SearchCommentTest',
+  'SearchNumberMatchingTest',
+  'SearchNumbersTest',
+  'SearchRankingTest',
+  'StatisticsAdminTest',
+  'CronRunTest',
+  'FloodTest',
+  'SearchIntegrationTest',
+  'SearchMultilingualTest',
+  // https://www.drupal.org/node/2795071
+  'NodeAccessBaseTableTest',
+  // @todo ... there are more
+
+  // https://www.drupal.org/node/2795073
+  'VocabularyUiTest',
+  'SimpleTestBrowserTest',
+  // https://www.drupal.org/node/2738567
+  'CommentPreviewTest',
+  'ConfigImportUploadTest',
+  'ContentTranslationSyncImageTest',
+  'EditorUploadImageScaleTest',
+  'EntityReferenceFileUploadTest',
+  'FileFieldDisplayTest',
+  'FileOnTranslatedEntityTest',
+  'PrivateFileOnTranslatedEntityTest',
+  'SaveUploadTest',
+  'FilterHtmlImageSecureTest',
+  'ImageFieldDefaultImagesTest',
+  'ImageFieldDisplayTest',
+  'FileMoveTest',
+  'ImageAdminStylesTest',
+  'ImageDimensionsTest',
+  'ImageFieldValidateTest',
+  'ImageOnTranslatedEntityTest',
+  'ImageStyleFlushTest',
+  'ImageStylesPathAndUrlTest',
+  'ImageThemeFunctionTest',
+  'PagePreviewTest',
+  'QuickEditLoadingTest',
+  'ImageFieldAttributesTest',
+  'ResponsiveImageFieldDisplayTest',
+  'StateValuesCleanAdvancedTest',
+  'ThemeTest',
+  'TaxonomyImageTest',
+  'TextFieldTest',
+  'UpdateUploadTest',
+  'UserPasswordResetTest',
+  'UserPictureTest',
+
 
   // Exclude update tests, they are their own beast.
   'Update',
diff --git a/core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php b/core/modules/aggregator/src/Tests/FeedLanguageTest.php
similarity index 98%
rename from core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php
rename to core/modules/aggregator/src/Tests/FeedLanguageTest.php
index 81f8b42..af8335e 100644
--- a/core/modules/aggregator/tests/src/Functional/FeedLanguageTest.php
+++ b/core/modules/aggregator/src/Tests/FeedLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\aggregator\Functional;
+namespace Drupal\aggregator\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 
diff --git a/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php b/core/modules/block/src/Tests/BlockAdminThemeTest.php
similarity index 94%
rename from core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
rename to core/modules/block/src/Tests/BlockAdminThemeTest.php
index 6c4ffb6..ab444d5 100644
--- a/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
+++ b/core/modules/block/src/Tests/BlockAdminThemeTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\Tests\block\Functional;
+namespace Drupal\block\Tests;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests the block system with admin themes.
  *
  * @group block
  */
-class BlockAdminThemeTest extends BrowserTestBase {
+class BlockAdminThemeTest extends WebTestBase {
 
   /**
    * Modules to install.
diff --git a/core/modules/comment/tests/src/Functional/CommentPreviewTest.php b/core/modules/comment/src/Tests/CommentPreviewTest.php
similarity index 99%
rename from core/modules/comment/tests/src/Functional/CommentPreviewTest.php
rename to core/modules/comment/src/Tests/CommentPreviewTest.php
index ef42870..837a78a 100644
--- a/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
+++ b/core/modules/comment/src/Tests/CommentPreviewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\comment\Functional;
+namespace Drupal\comment\Tests;
 
 use Drupal\comment\CommentManagerInterface;
 use Drupal\Component\Render\MarkupInterface;
diff --git a/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php b/core/modules/config/src/Tests/ConfigImportUploadTest.php
similarity index 92%
rename from core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
rename to core/modules/config/src/Tests/ConfigImportUploadTest.php
index 47c5c52..9836d77 100644
--- a/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
+++ b/core/modules/config/src/Tests/ConfigImportUploadTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\Tests\config\Functional;
+namespace Drupal\config\Tests;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests importing configuration from an uploaded file.
  *
  * @group config
  */
-class ConfigImportUploadTest extends BrowserTestBase {
+class ConfigImportUploadTest extends WebTestBase {
 
   /**
    * A user with the 'import configuration' permission.
diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.php
similarity index 92%
rename from core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
rename to core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.php
index 559b8c7..ab51a43 100644
--- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.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;
 
 /**
  * Verifies theme configuration translation settings.
  *
  * @group config_translation
  */
-class ConfigTranslationUiThemeTest extends BrowserTestBase {
+class ConfigTranslationUiThemeTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
similarity index 99%
rename from core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
rename to core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
index 5cb8bc1..5f881a7 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\content_translation\Functional;
+namespace Drupal\content_translation\Tests;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\field\Entity\FieldConfig;
diff --git a/core/modules/dblog/tests/src/Functional/DbLogTest.php b/core/modules/dblog/src/Tests/DbLogTest.php
similarity index 99%
rename from core/modules/dblog/tests/src/Functional/DbLogTest.php
rename to core/modules/dblog/src/Tests/DbLogTest.php
index 7ca0964..886f768 100644
--- a/core/modules/dblog/tests/src/Functional/DbLogTest.php
+++ b/core/modules/dblog/src/Tests/DbLogTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\dblog\Functional;
+namespace Drupal\dblog\Tests;
 
 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\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Generate events and verify dblog entries; verify user access to log reports
@@ -15,7 +15,7 @@
  *
  * @group dblog
  */
-class DbLogTest extends BrowserTestBase {
+class DbLogTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php b/core/modules/editor/src/Tests/EditorUploadImageScaleTest.php
similarity index 98%
rename from core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
rename to core/modules/editor/src/Tests/EditorUploadImageScaleTest.php
index 58cce8d..5ac88c7 100644
--- a/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
+++ b/core/modules/editor/src/Tests/EditorUploadImageScaleTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\Tests\editor\Functional;
+namespace Drupal\editor\Tests;
 
 use Drupal\editor\Entity\Editor;
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests scaling of inline images.
  *
  * @group editor
  */
-class EditorUploadImageScaleTest extends BrowserTestBase {
+class EditorUploadImageScaleTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
similarity index 96%
rename from core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
rename to core/modules/field/src/Tests/reEnableModuleFieldTest.php
index e9f54d9..b718e75 100644
--- a/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
+++ b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\field\Functional;
+namespace Drupal\field\Tests;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group field
  */
-class reEnableModuleFieldTest extends BrowserTestBase {
+class reEnableModuleFieldTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php b/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
similarity index 99%
rename from core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php
rename to core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
index 788257c..a7150e5 100644
--- a/core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php
+++ b/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\file\Functional;
+namespace Drupal\file\Tests;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php b/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
similarity index 99%
rename from core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php
rename to core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
index 74eb747..15039ed 100644
--- a/core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php
+++ b/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\file\Functional;
+namespace Drupal\file\Tests;
 
 use Drupal\file\Entity\File;
 use Drupal\node\Entity\Node;
diff --git a/core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php b/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
similarity index 90%
rename from core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php
rename to core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
index 284fbdf..b1ee6a6 100644
--- a/core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php
+++ b/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\file\Functional;
+namespace Drupal\file\Tests;
 
 /**
  * Tests the file uploading functions.
diff --git a/core/modules/file/tests/src/Functional/SaveUploadTest.php b/core/modules/file/src/Tests/SaveUploadTest.php
similarity index 99%
rename from core/modules/file/tests/src/Functional/SaveUploadTest.php
rename to core/modules/file/src/Tests/SaveUploadTest.php
index 517990a..3aaa5cf 100644
--- a/core/modules/file/tests/src/Functional/SaveUploadTest.php
+++ b/core/modules/file/src/Tests/SaveUploadTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\file\Functional;
+namespace Drupal\file\Tests;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
similarity index 97%
rename from core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
rename to core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
index c9f521e..5ce4e6d 100644
--- a/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
+++ b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\Tests\filter\Functional;
+namespace Drupal\filter\Tests;
 
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\StreamWrapper\PublicStream;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\filter\Entity\FilterFormat;
 
 /**
@@ -12,7 +12,7 @@
  *
  * @group filter
  */
-class FilterHtmlImageSecureTest extends BrowserTestBase {
+class FilterHtmlImageSecureTest extends WebTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/image/tests/src/Functional/FileMoveTest.php b/core/modules/image/src/Tests/FileMoveTest.php
similarity index 92%
rename from core/modules/image/tests/src/Functional/FileMoveTest.php
rename to core/modules/image/src/Tests/FileMoveTest.php
index 3ac543e..1957994 100644
--- a/core/modules/image/tests/src/Functional/FileMoveTest.php
+++ b/core/modules/image/src/Tests/FileMoveTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\image\Functional;
+namespace Drupal\image\Tests;
 
 use Drupal\file\Entity\File;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\image\Entity\ImageStyle;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group image
  */
-class FileMoveTest extends BrowserTestBase {
+class FileMoveTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
similarity index 99%
rename from core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
rename to core/modules/image/src/Tests/ImageAdminStylesTest.php
index 832a988..4b7ff43 100644
--- a/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\image\Functional;
+namespace Drupal\image\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
diff --git a/core/modules/image/tests/src/Functional/ImageDimensionsTest.php b/core/modules/image/src/Tests/ImageDimensionsTest.php
similarity index 98%
rename from core/modules/image/tests/src/Functional/ImageDimensionsTest.php
rename to core/modules/image/src/Tests/ImageDimensionsTest.php
index 8d3b369..6f73042 100644
--- a/core/modules/image/tests/src/Functional/ImageDimensionsTest.php
+++ b/core/modules/image/src/Tests/ImageDimensionsTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\Tests\image\Functional;
+namespace Drupal\image\Tests;
 
 use Drupal\image\Entity\ImageStyle;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests that images have correct dimensions when styled.
  *
  * @group image
  */
-class ImageDimensionsTest extends BrowserTestBase {
+class ImageDimensionsTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php b/core/modules/image/src/Tests/ImageFieldValidateTest.php
similarity index 99%
rename from core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
rename to core/modules/image/src/Tests/ImageFieldValidateTest.php
index b2ada06..5f0bf21 100644
--- a/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
+++ b/core/modules/image/src/Tests/ImageFieldValidateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\image\Functional;
+namespace Drupal\image\Tests;
 
 /**
  * Tests validation functions such as min/max resolution.
diff --git a/core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php b/core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
similarity index 99%
rename from core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php
rename to core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
index a78920b..e716d28 100644
--- a/core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php
+++ b/core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\image\Functional;
+namespace Drupal\image\Tests;
 
 use Drupal\file\Entity\File;
 
diff --git a/core/modules/image/tests/src/Functional/ImageStyleFlushTest.php b/core/modules/image/src/Tests/ImageStyleFlushTest.php
similarity index 98%
rename from core/modules/image/tests/src/Functional/ImageStyleFlushTest.php
rename to core/modules/image/src/Tests/ImageStyleFlushTest.php
index 316f67d..63c0d80 100644
--- a/core/modules/image/tests/src/Functional/ImageStyleFlushTest.php
+++ b/core/modules/image/src/Tests/ImageStyleFlushTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\image\Functional;
+namespace Drupal\image\Tests;
 
 use Drupal\image\Entity\ImageStyle;
 
diff --git a/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php b/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
similarity index 99%
rename from core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
rename to core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
index cfade75..d03bc3b 100644
--- a/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
+++ b/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\Tests\image\Functional;
+namespace Drupal\image\Tests;
 
 use Drupal\image\Entity\ImageStyle;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests the functions for generating paths and URLs for image styles.
  *
  * @group image
  */
-class ImageStylesPathAndUrlTest extends BrowserTestBase {
+class ImageStylesPathAndUrlTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/tests/src/Functional/ImageThemeFunctionTest.php b/core/modules/image/src/Tests/ImageThemeFunctionTest.php
similarity index 98%
rename from core/modules/image/tests/src/Functional/ImageThemeFunctionTest.php
rename to core/modules/image/src/Tests/ImageThemeFunctionTest.php
index f276d0d..52cf6c6 100644
--- a/core/modules/image/tests/src/Functional/ImageThemeFunctionTest.php
+++ b/core/modules/image/src/Tests/ImageThemeFunctionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\image\Functional;
+namespace Drupal\image\Tests;
 
 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\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -16,7 +16,7 @@
  *
  * @group image
  */
-class ImageThemeFunctionTest extends BrowserTestBase {
+class ImageThemeFunctionTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
similarity index 99%
rename from core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
rename to core/modules/node/src/Tests/NodeAccessBaseTableTest.php
index 79cfb0b..74e2340 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
+++ b/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\node\Functional;
+namespace Drupal\node\Tests;
 
 use Drupal\node\Entity\NodeType;
 
diff --git a/core/modules/node/tests/src/Functional/PagePreviewTest.php b/core/modules/node/src/Tests/PagePreviewTest.php
similarity index 99%
rename from core/modules/node/tests/src/Functional/PagePreviewTest.php
rename to core/modules/node/src/Tests/PagePreviewTest.php
index 51e249b..2bfd2e7 100644
--- a/core/modules/node/tests/src/Functional/PagePreviewTest.php
+++ b/core/modules/node/src/Tests/PagePreviewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\node\Functional;
+namespace Drupal\node\Tests;
 
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
diff --git a/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
similarity index 98%
rename from core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
rename to core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
index 6730b92..cce663b 100644
--- a/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
+++ b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rdf\Functional;
+namespace Drupal\rdf\Tests;
 
 use Drupal\image\Entity\ImageStyle;
 use Drupal\image\Tests\ImageFieldTestBase;
diff --git a/core/modules/search/tests/src/Functional/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php
similarity index 99%
rename from core/modules/search/tests/src/Functional/SearchCommentTest.php
rename to core/modules/search/src/Tests/SearchCommentTest.php
index 7b70f35..f67637f 100644
--- a/core/modules/search/tests/src/Functional/SearchCommentTest.php
+++ b/core/modules/search/src/Tests/SearchCommentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\search\Tests;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
diff --git a/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php b/core/modules/search/src/Tests/SearchNumberMatchingTest.php
similarity index 98%
rename from core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
rename to core/modules/search/src/Tests/SearchNumberMatchingTest.php
index e36cbe4..a6ad057 100644
--- a/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
+++ b/core/modules/search/src/Tests/SearchNumberMatchingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\search\Tests;
 
 use Drupal\Core\Language\LanguageInterface;
 
diff --git a/core/modules/search/tests/src/Functional/SearchNumbersTest.php b/core/modules/search/src/Tests/SearchNumbersTest.php
similarity index 98%
rename from core/modules/search/tests/src/Functional/SearchNumbersTest.php
rename to core/modules/search/src/Tests/SearchNumbersTest.php
index c438b9c..30d3906 100644
--- a/core/modules/search/tests/src/Functional/SearchNumbersTest.php
+++ b/core/modules/search/src/Tests/SearchNumbersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\search\Tests;
 
 use Drupal\Core\Language\LanguageInterface;
 
diff --git a/core/modules/search/tests/src/Functional/SearchRankingTest.php b/core/modules/search/src/Tests/SearchRankingTest.php
similarity index 99%
rename from core/modules/search/tests/src/Functional/SearchRankingTest.php
rename to core/modules/search/src/Tests/SearchRankingTest.php
index 0244592..2045233 100644
--- a/core/modules/search/tests/src/Functional/SearchRankingTest.php
+++ b/core/modules/search/src/Tests/SearchRankingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\search\Tests;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
diff --git a/core/modules/simpletest/tests/src/Functional/SimpleTestBrowserTest.php b/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
similarity index 97%
rename from core/modules/simpletest/tests/src/Functional/SimpleTestBrowserTest.php
rename to core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
index be8140d..91e37d3 100644
--- a/core/modules/simpletest/tests/src/Functional/SimpleTestBrowserTest.php
+++ b/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\Tests\simpletest\Functional;
+namespace Drupal\simpletest\Tests;
 
 use Drupal\Core\Url;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests the Simpletest UI internal browser.
  *
  * @group simpletest
  */
-class SimpleTestBrowserTest extends BrowserTestBase {
+class SimpleTestBrowserTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php b/core/modules/statistics/src/Tests/StatisticsAdminTest.php
similarity index 97%
rename from core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
rename to core/modules/statistics/src/Tests/StatisticsAdminTest.php
index e151b84..565925c 100644
--- a/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsAdminTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\Tests\statistics\Functional;
+namespace Drupal\statistics\Tests;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests the statistics admin.
  *
  * @group statistics
  */
-class StatisticsAdminTest extends BrowserTestBase {
+class StatisticsAdminTest extends WebTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
similarity index 98%
rename from core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
rename to core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
index a9cea4e..306e160 100644
--- a/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\taxonomy\Functional;
+namespace Drupal\taxonomy\Tests;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\user\RoleInterface;
diff --git a/core/modules/taxonomy/tests/src/Functional/ThemeTest.php b/core/modules/taxonomy/src/Tests/ThemeTest.php
similarity index 97%
rename from core/modules/taxonomy/tests/src/Functional/ThemeTest.php
rename to core/modules/taxonomy/src/Tests/ThemeTest.php
index d451ecc..54ad6e4 100644
--- a/core/modules/taxonomy/tests/src/Functional/ThemeTest.php
+++ b/core/modules/taxonomy/src/Tests/ThemeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\taxonomy\Functional;
+namespace Drupal\taxonomy\Tests;
 
 /**
  * Verifies that various taxonomy pages use the expected theme.
diff --git a/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php b/core/modules/taxonomy/src/Tests/VocabularyUiTest.php
similarity index 99%
rename from core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
rename to core/modules/taxonomy/src/Tests/VocabularyUiTest.php
index 88cb49e..76fcac2 100644
--- a/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
+++ b/core/modules/taxonomy/src/Tests/VocabularyUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\taxonomy\Functional;
+namespace Drupal\taxonomy\Tests;
 use Drupal\Component\Utility\Unicode;
 
 use Drupal\Core\Url;
diff --git a/core/modules/text/tests/src/Functional/TextFieldTest.php b/core/modules/text/src/Tests/TextFieldTest.php
similarity index 99%
rename from core/modules/text/tests/src/Functional/TextFieldTest.php
rename to core/modules/text/src/Tests/TextFieldTest.php
index 2cee657..993346a 100644
--- a/core/modules/text/tests/src/Functional/TextFieldTest.php
+++ b/core/modules/text/src/Tests/TextFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\text\Functional;
+namespace Drupal\text\Tests;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\entity_test\Entity\EntityTest;
diff --git a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php
similarity index 99%
rename from core/modules/user/tests/src/Functional/UserPasswordResetTest.php
rename to core/modules/user/src/Tests/UserPasswordResetTest.php
index 118edc5..c012e9f 100644
--- a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
+++ b/core/modules/user/src/Tests/UserPasswordResetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\user\Functional;
+namespace Drupal\user\Tests;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Url;
diff --git a/core/modules/user/tests/src/Functional/UserPictureTest.php b/core/modules/user/src/Tests/UserPictureTest.php
similarity index 97%
rename from core/modules/user/tests/src/Functional/UserPictureTest.php
rename to core/modules/user/src/Tests/UserPictureTest.php
index e7f505c..3f8db42 100644
--- a/core/modules/user/tests/src/Functional/UserPictureTest.php
+++ b/core/modules/user/src/Tests/UserPictureTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\Tests\user\Functional;
+namespace Drupal\user\Tests;
 
 use Drupal\image\Entity\ImageStyle;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\simpletest\WebTestBase;
 use Drupal\file\Entity\File;
 
 /**
@@ -11,7 +11,7 @@
  *
  * @group user
  */
-class UserPictureTest extends BrowserTestBase {
+class UserPictureTest extends WebTestBase {
 
   /**
    * The profile to install as a basis for testing.
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 7939069..116b829 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -932,7 +932,9 @@ protected function submitForm(array $edit, $submit, $form_html_id = NULL) {
    * @param array $options
    *   Options to be forwarded to the url generator.
    */
-  protected function drupalPostForm($path, array $edit, $submit, array $options = array()) {
+  protected function drupalPostForm($path, $edit, $submit, array $options = array()) {
+    $edit = (array) $edit;
+
     if (is_object($submit)) {
       // Cast MarkupInterface objects to string.
       $submit = (string) $submit;