diff --git a/browsertest-convert.php b/browsertest-convert.php
index 61bd6c5..ed1c9ce 100644
--- a/browsertest-convert.php
+++ b/browsertest-convert.php
@@ -326,147 +326,141 @@
   'big_pipe',
 
   // All other kind of issues
-  'Drupal\Tests\block\Functional\BlockLanguageCacheTest',
-  'Drupal\Tests\block\Functional\BlockSystemBrandingTest',
-  'Drupal\Tests\block\Functional\BlockXssTest',
-  'Drupal\Tests\block_content\Functional\BlockContentCreationTest',
-  'Drupal\Tests\block_content\Functional\BlockContentListTest',
-  'Drupal\Tests\block_content\Functional\BlockContentListViewsTest',
-  'Drupal\Tests\block_content\Functional\BlockContentTypeTest',
-  'Drupal\FunctionalTests\BrowserTestBaseTest',
-  'Drupal\Tests\system\Functional\Cache\SessionExistsCacheContextTest',
-  'Drupal\Tests\system\Functional\Common\NoJavaScriptAnonymousTest',
-  'Drupal\Tests\system\Functional\Common\SimpleTestErrorCollectorTest',
-  'Drupal\Tests\config\Functional\ConfigEntityFormOverrideTest',
-  'Drupal\Tests\config\Functional\ConfigEntityListTest',
-  'Drupal\Tests\config\Functional\ConfigFormOverrideTest',
-  'Drupal\Tests\config\Functional\ConfigImportInstallProfileTest',
-  'Drupal\Tests\config\Functional\ConfigImportUITest',
-  'Drupal\Tests\config\Functional\ConfigInstallWebTest',
-  'Drupal\Tests\config\Functional\ConfigSingleImportExportTest',
-  'Drupal\Tests\config\Functional\LanguageNegotiationFormOverrideTest',
-  'Drupal\Tests\config_translation\Functional\ConfigTranslationOverviewTest',
-  'Drupal\Tests\contact\Functional\ContactSitewideTest',
-  'Drupal\Tests\contact\Functional\ContactStorageTest',
-  'Drupal\Tests\content_moderation\Functional\ModerationStateNodeTest',
-  'Drupal\Tests\content_translation\Functional\ContentTestTranslationUITest',
-  'Drupal\Tests\content_translation\Functional\ContentTranslationContextualLinksTest',
-  'Drupal\Tests\content_translation\Functional\ContentTranslationSettingsTest',
-  'Drupal\KernelTests\Core\Database\FetchTest',
-  'Drupal\Tests\editor\Functional\QuickEditIntegrationLoadingTest',
-  'Drupal\Tests\field\Functional\Email\EmailFieldTest',
-  'Drupal\Tests\field\Functional\FieldDefaultValueCallbackTest',
-  'Drupal\Tests\field\Functional\FieldImportDeleteUninstallUiTest',
-  'Drupal\Tests\field_ui\Functional\FieldUIDeleteTest',
-  'Drupal\Tests\field_ui\Functional\ManageFieldsTest',
-  'Drupal\Tests\file\Functional\DownloadTest',
-  'Drupal\Tests\file\Functional\FileFieldAnonymousSubmissionTest',
-  'Drupal\Tests\file\Functional\FileFieldFormatterAccessTest',
-  'Drupal\Tests\file\Functional\FileFieldPathTest',
-  'Drupal\Tests\file\Functional\FileFieldRevisionTest',
-  'Drupal\Tests\file\Functional\FileFieldRSSContentTest',
-  'Drupal\Tests\file\Functional\FileFieldValidateTest',
-  'Drupal\Tests\file\Functional\FilePrivateTest',
-  'Drupal\Tests\file\Functional\FileTokenReplaceTest',
-  'Drupal\Tests\filter\Functional\FilterAdminTest',
-  'Drupal\system\Tests\Form\ElementsTableSelectTest',
-  'Drupal\system\Tests\Form\FormTest',
-  'Drupal\Tests\system\Functional\Form\AlterTest',
-  'Drupal\Tests\system\Functional\Form\CheckboxTest',
-  'Drupal\Tests\system\Functional\Form\ElementsLabelsTest',
-  'Drupal\Tests\system\Functional\Form\ElementsVerticalTabsTest',
-  'Drupal\Tests\system\Functional\Form\ElementTest',
-  'Drupal\Tests\system\Functional\Form\EmailTest',
-  'Drupal\Tests\system\Functional\Form\ProgrammaticTest',
-  'Drupal\Tests\system\Functional\Form\ResponseTest',
-  'Drupal\Tests\system\Functional\Form\StateValuesCleanTest',
-  'Drupal\Tests\system\Functional\Form\StorageTest',
-  'Drupal\Tests\system\Functional\Form\TriggeringElementTest',
-  'Drupal\Tests\system\Functional\Form\UrlTest',
-  'Drupal\Tests\system\Functional\Form\ValidationTest',
-  'Drupal\Tests\forum\Functional\ForumTest',
-  'Drupal\Tests\forum\Functional\ForumUninstallTest',
-  'Drupal\Tests\tour\Functional\TourHelpPageTest',
-  'Drupal\Tests\language\Functional\LanguageConfigurationTest',
-  'Drupal\Tests\language\Functional\LanguageListTest',
-  'Drupal\Tests\language\Functional\LanguageLocaleListTest',
-  'Drupal\Tests\language\Functional\LanguageSwitchingTest',
-  'Drupal\Tests\language\Functional\LanguageUrlRewritingTest',
-  'Drupal\Tests\link\Functional\LinkFieldTest',
-  'Drupal\Tests\locale\Functional\LocaleConfigTranslationImportTest',
-  'Drupal\Tests\locale\Functional\LocaleConfigTranslationTest',
-  'Drupal\Tests\locale\Functional\LocaleExportTest',
-  'Drupal\Tests\locale\Functional\LocaleImportFunctionalTest',
-  'Drupal\Tests\locale\Functional\LocaleJavascriptTranslationTest',
-  'Drupal\Tests\locale\Functional\LocalePluralFormatTest',
-  'Drupal\Tests\locale\Functional\LocaleTranslationUiTest',
-  'Drupal\Tests\system\Functional\Menu\BreadcrumbTest',
-  'Drupal\Tests\system\Functional\Menu\LocalActionTest',
-  'Drupal\Tests\system\Functional\Menu\LocalTasksTest',
-  'Drupal\Tests\menu_ui\Functional\MenuLanguageTest',
-  'Drupal\Tests\menu_ui\Functional\MenuTest',
-  'Drupal\Tests\system\Functional\Module\VersionTest',
-  'Drupal\Tests\node\Functional\NodeAccessRebuildNodeGrantsTest',
-  'Drupal\Tests\node\Functional\NodeFieldMultilingualTest',
-  'Drupal\Tests\node\Functional\NodeFormButtonsTest',
-  'Drupal\Tests\node\Functional\NodeRevisionPermissionsTest',
-  'Drupal\Tests\node\Functional\NodeRevisionsTest',
-  'Drupal\Tests\node\Functional\NodeTitleTest',
-  'Drupal\Tests\node\Functional\NodeTitleXSSTest',
-  'Drupal\Tests\system\Functional\Page\DefaultMetatagsTest',
-  'Drupal\KernelTests\Core\Path\AliasTest',
-  'Drupal\KernelTests\Core\Plugin\Condition\RequestPathTest',
-  'Drupal\Tests\rdf\Functional\GetNamespacesTest',
-  'Drupal\Tests\rdf\Kernel\Field\FieldRdfaDatatypeCallbackTest',
-  'Drupal\Tests\responsive_image\Functional\ResponsiveImageAdminUITest',
-  'Drupal\Tests\system\Functional\Routing\RouterTest',
-  'Drupal\Tests\search\Functional\SearchLanguageTest',
-  'Drupal\Tests\search\Functional\SearchPageTextTest',
-  'Drupal\Tests\search\Functional\SearchPreprocessLangcodeTest',
-  'Drupal\Tests\system\Functional\Session\SessionHttpsTest',
-  'Drupal\Tests\system\Functional\Session\StackSessionHandlerIntegrationTest',
-  'Drupal\Tests\shortcut\Functional\ShortcutSetsTest',
-  'Drupal\simpletest\Tests\SimpleTestBrowserTest',
-  'Drupal\Tests\simpletest\Functional\BrokenSetUpTest',
-  'Drupal\Tests\simpletest\Functional\BrowserTest',
-  'Drupal\Tests\simpletest\Functional\InstallationProfileModuleTestsTest',
-  'Drupal\Tests\simpletest\Functional\MissingCheckedRequirementsTest',
-  'Drupal\Tests\simpletest\Functional\SimpleTestTest',
-  'Drupal\Tests\simpletest\Functional\TimeZoneTest',
-  'Drupal\Tests\statistics\Functional\StatisticsLoggingTest',
-  'Drupal\Tests\syslog\Functional\SyslogTest',
-  'Drupal\system\Tests\System\UncaughtExceptionTest',
-  'Drupal\Tests\system\Functional\System\AdminTest',
-  'Drupal\Tests\system\Functional\System\DefaultMobileMetaTagsTest',
-  'Drupal\Tests\system\Functional\System\ErrorHandlerTest',
-  'Drupal\Tests\system\Functional\System\HtaccessTest',
-  'Drupal\Tests\system\Functional\System\PageTitleTest',
-  'Drupal\Tests\system\Functional\System\SiteMaintenanceTest',
-  'Drupal\Tests\taxonomy\Functional\RssTest',
-  'Drupal\Tests\taxonomy\Functional\TaxonomyTermIndentationTest',
-  'Drupal\Tests\taxonomy\Functional\TermTranslationTest',
-  'Drupal\Tests\field\Functional\String\StringFieldTest',
-  'Drupal\text\Tests\TextFieldTest',
-  'Drupal\Tests\system\Functional\Theme\HtmlAttributesTest',
-  'Drupal\Tests\system\Functional\Theme\TwigDebugMarkupTest',
-  'Drupal\Tests\system\Functional\Theme\TwigFilterTest',
-  'Drupal\Tests\system\Functional\Theme\TwigNamespaceTest',
-  'Drupal\Tests\system\Functional\Theme\TwigRawTest',
-  'Drupal\Tests\system\Functional\Theme\TwigTransTest',
-  'Drupal\Tests\toolbar\Functional\ToolbarAdminMenuTest',
-  'Drupal\Tests\toolbar\Functional\ToolbarMenuTranslationTest',
-  'Drupal\Tests\tour\Functional\TourTest',
-  'Drupal\Tests\tracker\Functional\Views\TrackerUserUidTest',
-  'Drupal\Tests\user\Functional\UserAdminLanguageTest',
-  'Drupal\Tests\user\Functional\UserAdminListingTest',
-  'Drupal\Tests\user\Functional\UserAdminTest',
-  'Drupal\Tests\user\Functional\UserCancelTest',
-  'Drupal\Tests\user\Functional\UserCreateTest',
-  'Drupal\Tests\user\Functional\UserEditTest',
-  'Drupal\Tests\user\Functional\UserLanguageCreationTest',
-  'Drupal\Tests\user\Functional\UserLoginTest',
-  'Drupal\Tests\user\Functional\UserPermissionsTest',
-
+  'BlockLanguageCacheTest',
+  'BlockSystemBrandingTest',
+  'BlockXssTest',
+  'BlockContentCreationTest',
+  'BlockContentListTest',
+  'BlockContentListViewsTest',
+  'BlockContentTypeTest',
+  'SessionExistsCacheContextTest',
+  'NoJavaScriptAnonymousTest',
+  'SimpleTestErrorCollectorTest',
+  'ConfigEntityFormOverrideTest',
+  'ConfigEntityListTest',
+  'ConfigFormOverrideTest',
+  'ConfigImportInstallProfileTest',
+  'ConfigImportUITest',
+  'ConfigInstallWebTest',
+  'ConfigSingleImportExportTest',
+  'LanguageNegotiationFormOverrideTest',
+  'ConfigTranslationOverviewTest',
+  'ContactSitewideTest',
+  'ContactStorageTest',
+  'ModerationStateNodeTest',
+  'ContentTestTranslationUITest',
+  'ContentTranslationContextualLinksTest',
+  'ContentTranslationSettingsTest',
+  'QuickEditIntegrationLoadingTest',
+  'EmailFieldTest',
+  'FieldDefaultValueCallbackTest',
+  'FieldImportDeleteUninstallUiTest',
+  'FieldUIDeleteTest',
+  'ManageFieldsTest',
+  'DownloadTest',
+  'FileFieldAnonymousSubmissionTest',
+  'FileFieldFormatterAccessTest',
+  'FileFieldPathTest',
+  'FileFieldRevisionTest',
+  'FileFieldRSSContentTest',
+  'FileFieldValidateTest',
+  'FilePrivateTest',
+  'FileTokenReplaceTest',
+  'FilterAdminTest',
+  'ElementsTableSelectTest',
+  'FormTest',
+  'AlterTest',
+  'CheckboxTest',
+  'ElementsLabelsTest',
+  'ElementsVerticalTabsTest',
+  'ElementTest',
+  'EmailTest',
+  'ProgrammaticTest',
+  'ResponseTest',
+  'StateValuesCleanTest',
+  'StorageTest',
+  'TriggeringElementTest',
+  'UrlTest',
+  'ValidationTest',
+  'ForumTest',
+  'ForumUninstallTest',
+  'TourHelpPageTest',
+  'LanguageConfigurationTest',
+  'LanguageListTest',
+  'LanguageLocaleListTest',
+  'LanguageSwitchingTest',
+  'LanguageUrlRewritingTest',
+  'LinkFieldTest',
+  'LocaleConfigTranslationImportTest',
+  'LocaleConfigTranslationTest',
+  'LocaleExportTest',
+  'LocaleImportFunctionalTest',
+  'LocaleJavascriptTranslationTest',
+  'LocalePluralFormatTest',
+  'LocaleTranslationUiTest',
+  'BreadcrumbTest',
+  'LocalActionTest',
+  'LocalTasksTest',
+  'MenuLanguageTest',
+  'MenuTest',
+  'VersionTest',
+  'NodeAccessRebuildNodeGrantsTest',
+  'NodeFieldMultilingualTest',
+  'NodeFormButtonsTest',
+  'NodeRevisionPermissionsTest',
+  'NodeRevisionsTest',
+  'NodeTitleTest',
+  'NodeTitleXSSTest',
+  'DefaultMetatagsTest',
+  'FieldRdfaDatatypeCallbackTest',
+  'ResponsiveImageAdminUITest',
+  'Routing\RouterTest',
+  'SearchLanguageTest',
+  'SearchPageTextTest',
+  'SearchPreprocessLangcodeTest',
+  'SessionHttpsTest',
+  'StackSessionHandlerIntegrationTest',
+  'ShortcutSetsTest',
+  'SimpleTestBrowserTest',
+  'BrokenSetUpTest',
+  'BrowserTest',
+  'InstallationProfileModuleTestsTest',
+  'MissingCheckedRequirementsTest',
+  'SimpleTestTest',
+  'TimeZoneTest',
+  'StatisticsLoggingTest',
+  'SyslogTest',
+  'UncaughtExceptionTest',
+  'AdminTest',
+  'DefaultMobileMetaTagsTest',
+  'ErrorHandlerTest',
+  'HtaccessTest',
+  'PageTitleTest',
+  'SiteMaintenanceTest',
+  'RssTest',
+  'TaxonomyTermIndentationTest',
+  'TermTranslationTest',
+  'StringFieldTest',
+  'TextFieldTest',
+  'HtmlAttributesTest',
+  'TwigDebugMarkupTest',
+  'TwigFilterTest',
+  'TwigNamespaceTest',
+  'TwigRawTest',
+  'TwigTransTest',
+  'ToolbarAdminMenuTest',
+  'ToolbarMenuTranslationTest',
+  'TourTest',
+  'TrackerUserUidTest',
+  'UserAdminLanguageTest',
+  'UserAdminListingTest',
+  'UserAdminTest',
+  'UserCancelTest',
+  'UserCreateTest',
+  'UserEditTest',
+  'UserLanguageCreationTest',
+  'UserLoginTest',
+  'UserPermissionsTest',
 ];
 
 function isTestExcluded($test_name, array $excluded_tests) {