diff --git a/browsertest-convert.php b/browsertest-convert.php
index 1ed134e..f063c12 100644
--- a/browsertest-convert.php
+++ b/browsertest-convert.php
@@ -192,6 +192,45 @@
   'BasicTest',
   'PreviewTest',
   'RowUITest',
+  // https://www.drupal.org/node/2795111
+
+  'AddFeedTest',
+  'BigPipeTest',
+  'BlockRenderOrderTest',
+  'CommentBlockTest',
+  'CommentPreviewTest',
+  'CommentTestBase',
+  'CommentNonNodeTest',
+  'CommentTestBase',
+  'CommentRestExportTest',
+  'CommentUserNameTest',
+  'ConfigExportImportUITest',
+  'ConfigExportUITest',
+  'EditorAdminTest',
+  'EditorLoadingTest',
+  'ManageDisplayTest',
+  'FileListingTest',
+  'NumberFieldRdfaTest',
+  'StyleSerializerTest',
+  'FormTest',
+  'ThemeTest',
+  'RenderWebTest',
+  'SelectPagerDefaultTest',
+  'SelectTableSortDefaultTest',
+  'TemporaryQueryTest',
+  'LanguageSelectElementTest',
+  'DestinationTest',
+  'SessionAuthenticationTest',
+  'SessionTest',
+  'ShutdownFunctionsTest',
+  'EngineTwigTest',
+  'ThemeSuggestionsAlterTest',
+  'UpdateContribTest',
+  'UserBlocksTest',
+  'ViewsFormTest',
+  'ItemsPerPageTest',
+  'SortingTest',
+  'PreviewTest',
 
   // Exclude update tests, they are their own beast.
   'Update',
@@ -264,7 +303,11 @@ function glob_recursive($pattern, $flags = 0) {
 
 
     // Keep existing traits and base classes.
-    if (strpos($simpletest_file_path, 'Trait.php') === FALSE && strpos($simpletest_file_path, 'Base.php') === FALSE) {
+    if (
+      strpos($simpletest_file_path, 'Trait.php') === FALSE
+      && strpos($simpletest_file_path, 'Base.php') === FALSE
+      && strpos($simpletest_file_path, 'MockRouteProvider.php') === FALSE
+    ) {
       unlink($simpletest_file_path);
     }
   }