diff --git a/core/modules/system/tests/unicode.test b/core/modules/system/lib/Drupal/system/Tests/UnicodeTest.php
similarity index 98%
rename from core/modules/system/tests/unicode.test
rename to core/modules/system/lib/Drupal/system/Tests/UnicodeTest.php
index e87ea54..0be1ab0 100644
--- a/core/modules/system/tests/unicode.test
+++ b/core/modules/system/lib/Drupal/system/Tests/UnicodeTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Various unicode handling tests.
+ * Definition of Drupal\system\Tests\UnicodeTest.
  */
 
+namespace Drupal\system\Tests;
+
 use Drupal\simpletest\UnitTestBase;
 
 /**
  * Test unicode handling features implemented in unicode.inc.
  */
-class UnicodeUnitTest extends UnitTestBase {
+class UnicodeTest extends UnitTestBase {
 
   /**
    * Whether to run the extended version of the tests (including non latin1 characters).
diff --git a/core/modules/system/system.info b/core/modules/system/system.info
index 8a11985..fccdcac 100644
--- a/core/modules/system/system.info
+++ b/core/modules/system/system.info
@@ -35,7 +35,6 @@ files[] = tests/session.test
 files[] = tests/symfony.test
 files[] = tests/tablesort.test
 files[] = tests/theme.test
-files[] = tests/unicode.test
 files[] = tests/update.test
 files[] = tests/uuid.test
 files[] = tests/xmlrpc.test