diff --git a/core/lib/Drupal/Core/StringTranslation/StringTranslationTraitMock.php b/core/lib/Drupal/Core/StringTranslation/StringTranslationTraitMock.php
deleted file mode 100644
index 87003d3..0000000
--- a/core/lib/Drupal/Core/StringTranslation/StringTranslationTraitMock.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\StringTranslation\StringTranslationTraitMock.
- */
-
-namespace Drupal\Core\StringTranslation;
-
-/**
- * A mock class that uses the StringTranslationTrait for unit tests.
- */
-class StringTranslationTraitMock {
-
-  use StringTranslationTrait;
-
-}
diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php
index ca588b3..beaaac4 100644
--- a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\Tests\Core\StringTranslation;
 
 use Drupal\Tests\UnitTestCase;
-use Drupal\Core\StringTranslation\StringTranslationTraitMock;
 
 /**
  * Tests the string translation trait.
@@ -32,10 +31,10 @@ public function testT() {
     if (version_compare(PHP_VERSION, '5.4.0', '<')) {
       return;
     }
-    $method = (new \ReflectionClass('\Drupal\Core\StringTranslation\StringTranslationTraitMock'))->getMethod('t');
+    $method = (new \ReflectionClass('Drupal\Tests\Core\StringTranslation\TestStringTranslationTrait'))->getMethod('t');
     $method->setAccessible(TRUE);
 
-    $translation = new StringTranslationTraitMock();
+    $translation = new TestStringTranslationTrait();
     $translation->setTranslationManager($this->getStringTranslationStub());
     $this->assertEquals('something', $method->invoke($translation, 'something'));
   }
diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/TestStringTranslationTrait.php b/core/tests/Drupal/Tests/Core/StringTranslation/TestStringTranslationTrait.php
new file mode 100644
index 0000000..1d7141e
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/StringTranslation/TestStringTranslationTrait.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\StringTranslation\TestStringTranslationTrait.
+ */
+
+namespace Drupal\Tests\Core\StringTranslation;
+
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+
+/**
+ * A test class that uses the StringTranslationTrait for unit tests.
+ */
+class TestStringTranslationTrait {
+
+  use StringTranslationTrait;
+
+}