diff --git a/core/modules/system/tests/lock.test b/core/modules/system/lib/Drupal/system/Tests/Common/LockFunctionalTest.php
similarity index 96%
rename from core/modules/system/tests/lock.test
rename to core/modules/system/lib/Drupal/system/Tests/Common/LockFunctionalTest.php
index 65dcf806bcd7..4c1e4193df2e 100644
--- a/core/modules/system/tests/lock.test
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/LockFunctionalTest.php
@@ -1,11 +1,17 @@
 <?php
 
 /**
- * Tests for the lock system.
+ * @file
+ * Definition of Drupal\system\Tests\Common\LockFunctionalTest.
  */
 
+namespace Drupal\system\Tests\Common;
+
 use Drupal\simpletest\WebTestBase;
 
+/**
+ * Tests the lock system.
+ */
 class LockFunctionalTest extends WebTestBase {
 
   public static function getInfo() {
diff --git a/core/modules/system/system.info b/core/modules/system/system.info
index ca6fc80156be..3f93da7fcb55 100644
--- a/core/modules/system/system.info
+++ b/core/modules/system/system.info
@@ -17,7 +17,6 @@ files[] = tests/filetransfer.test
 files[] = tests/form.test
 files[] = tests/image.test
 files[] = tests/installer.test
-files[] = tests/lock.test
 files[] = tests/menu.test
 files[] = tests/module.test
 files[] = tests/pager.test