diff --git a/browsertest-convert.php b/browsertest-convert.php
index f8bd03b..65c0dbe 100644
--- a/browsertest-convert.php
+++ b/browsertest-convert.php
@@ -589,6 +589,11 @@ function glob_recursive($pattern, $flags = 0) {
     ) {
       $file_content = str_replace("use Drupal\\Tests\\BrowserTestBase;", "use Drupal\\Tests\\BrowserTestBase;\nuse Drupal\\taxonomy\\Tests\\TaxonomyTestTrait;", $file_content);
     }
+    if (strpos($file_content, 'use TaxonomyTranslationTestTrait;') !== FALSE
+      && strpos($file_content, "use Drupal\\taxonomy\\Tests\\TaxonomyTranslationTestTrait;") === FALSE
+    ) {
+      $file_content = str_replace("use Drupal\\node\\Entity\\Node;", "use Drupal\\node\\Entity\\Node;\nuse Drupal\\taxonomy\\Tests\\TaxonomyTranslationTestTrait;", $file_content);
+    }
 
     // Fix use statements for base classes.
     str_replace("use Drupal\\system\\Tests\\Cache\\PageCacheTagsTestBase;", "use Drupal\\Tests\\system\\Functional\\Cache\\PageCacheTagsTestBase;", $file_content);
diff --git a/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php b/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
index 7bb0fb1..35ccf0c 100644
--- a/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
+++ b/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
@@ -88,14 +88,4 @@ public function error() {
     ];
   }
 
-  /**
-   * Renders a page with encoded markup.
-   *
-   * @return array
-   *   A render array as expected by drupal_render()
-   */
-  public function renderEncodedMarkup() {
-    return ['#plain_text' => 'Bad html <script>alert(123);</script>'];
-  }
-
 }
diff --git a/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml b/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
index cbcf6d8..a2d5ed5 100644
--- a/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
+++ b/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
@@ -58,11 +58,3 @@ test_page_test.error:
     code: 200
   requirements:
     _access: 'TRUE'
-
-test_page_test.encoded:
-  path: '/test-encoded'
-  defaults:
-    _title: 'Page with encoded HTML'
-    _controller: '\Drupal\test_page_test\Controller\Test::renderEncodedMarkup'
-  requirements:
-    _access: 'TRUE'
diff --git a/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php b/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
index 7ba248a..9588e4d 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\node\Entity\Node;
+use Drupal\taxonomy\Tests\TaxonomyTranslationTestTrait;
 
 /**
  * Tests the translation of taxonomy terms field on nodes.