diff --git a/browsertest-convert.php b/browsertest-convert.php
index 0b0d2d4..f1bed71 100644
--- a/browsertest-convert.php
+++ b/browsertest-convert.php
@@ -160,6 +160,8 @@
   'UpdateUploadTest',
   'UserPasswordResetTest',
   'UserPictureTest',
+  'ToolkitTest',
+
   // https://www.drupal.org/node/2795085
   'BlockInstallTest',
   'PageCacheTest',
@@ -242,6 +244,58 @@
   'SortingTest',
   'PreviewTest',
 
+  // https://www.drupal.org/node/2795543
+  'UserRoleAdminTest',
+
+  // Ignore batch tests, @todo issue
+  'Batch',
+  // https://www.drupal.org/node/2795579
+  'DisplayBlockTest',
+  'CommentRssTest',
+  'NodeTranslationUITest',
+  'BlockContentTranslationUITest',
+  'TermTranslationUITest',
+  'ShortcutTranslationUITest',
+  'CommentTranslationUITest',
+  'MenuLinkContentTranslationUITest',
+  'UserTranslationUITest',
+  'NodeBlockFunctionalTest',
+  'StyleSerializerTest',
+  'StatisticsReportsTest',
+  'TokenReplaceWebTest',
+  'ToolbarCacheContextsTest',
+  'TrackerTest',
+  'FieldWebTest',
+  'DisplayPageWebTest',
+  'ExposedFormTest',
+  'PagerTest',
+  'FrontPageTest',
+  'PageCacheTagsIntegrationTest',
+
+  // The conversion script has some issues with 'CommentTestBase'
+  'comment',
+
+  // https://www.drupal.org/node/2795601
+  'FormatDateTest',
+  // https://www.drupal.org/node/2795611
+  'ContainerRebuildWebTest',
+  'HtmlResponseAttachmentsTest',
+
+  // https://www.drupal.org/node/2795615
+  'LanguageUILanguageNegotiationTest',
+
+  // migrate_drupal_ui :  ¯\_(ツ)_/¯
+  'migrate_drupal_ui',
+
+  // Crazy tests
+  'InstallUninstallTest',
+  'PrepareUninstallTest',
+
+  // https://www.drupal.org/node/1841474
+  'rest',
+
+
+
   // Exclude update tests, they are their own beast.
   'Update',
   // Exclude views, as their test base needs adaption.
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 116b829..deb2ac5 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -21,6 +21,7 @@
 use Drupal\Core\Session\UserSession;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
+use Drupal\Core\Test\AssertMailTrait;
 use Drupal\Core\Test\TestRunnerKernel;
 use Drupal\Core\Url;
 use Drupal\Core\Test\TestDatabase;
@@ -63,6 +64,10 @@
     createUser as drupalCreateUser;
   }
 
+  use AssertMailTrait {
+    getMails as drupalGetMails;
+  }
+
   /**
    * Class loader.
    *