diff --git a/core/modules/system/tests/password.test b/core/modules/system/lib/Drupal/system/Tests/Common/PasswordHashingTest.php
similarity index 96%
rename from core/modules/system/tests/password.test
rename to core/modules/system/lib/Drupal/system/Tests/Common/PasswordHashingTest.php
index 25878222ce2..b463db0f412 100644
--- a/core/modules/system/tests/password.test
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/PasswordHashingTest.php
@@ -2,9 +2,11 @@
 
 /**
  * @file
- * Provides unit tests for password.inc.
+ * Definition of Drupal\system\Tests\Common\PasswordHashingTest.
  */
 
+namespace Drupal\system\Tests\Common;
+
 use Drupal\simpletest\WebTestBase;
 
 /**
diff --git a/core/modules/system/system.info b/core/modules/system/system.info
index b1b09e0fe92..ca6fc80156b 100644
--- a/core/modules/system/system.info
+++ b/core/modules/system/system.info
@@ -21,7 +21,6 @@ files[] = tests/lock.test
 files[] = tests/menu.test
 files[] = tests/module.test
 files[] = tests/pager.test
-files[] = tests/password.test
 files[] = tests/path.test
 files[] = tests/registry.test
 files[] = tests/schema.test