diff --git a/core/modules/system/tests/unicode.test b/core/modules/system/lib/Drupal/system/Tests/UnicodeUnitTest.php
similarity index 99%
rename from core/modules/system/tests/unicode.test
rename to core/modules/system/lib/Drupal/system/Tests/UnicodeUnitTest.php
index e87ea54a8ac6b07c0c64be7915a93e6a1bf2c0b6..f2e463a1454feae23178c3d44519f7beff3c5f48 100644
--- a/core/modules/system/tests/unicode.test
+++ b/core/modules/system/lib/Drupal/system/Tests/UnicodeUnitTest.php
@@ -2,9 +2,11 @@
 
 /**
  * @file
- * Various unicode handling tests.
+ * Definition of Drupal\system\Tests\UnicodeUnitTest.
  */
 
+namespace Drupal\system\Tests;
+
 use Drupal\simpletest\UnitTestBase;
 
 /**
diff --git a/core/modules/system/system.info b/core/modules/system/system.info
index 897f4dc07e5906a5edfdd381879eb036ca29bdec..15fcd46f45d657c3a47115e32a9ee4c52d617724 100644
--- a/core/modules/system/system.info
+++ b/core/modules/system/system.info
@@ -32,7 +32,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