diff --git modules/field/field.info modules/field/field.info
index f92aca3..7e88c40 100644
--- modules/field/field.info
+++ modules/field/field.info
@@ -12,6 +12,6 @@ files[] = field.default.inc
 files[] = field.multilingual.inc
 files[] = field.attach.inc
 files[] = field.form.inc
-files[] = tests/field.test
+files[] = field.test
 dependencies[] = field_sql_storage
 required = TRUE
diff --git modules/field/modules/list/list.info modules/field/modules/list/list.info
index b531c9b..6f064fc 100644
--- modules/field/modules/list/list.info
+++ modules/field/modules/list/list.info
@@ -5,5 +5,5 @@ package = Core
 version = VERSION
 core = 7.x
 files[]=list.module
-files[]=tests/list.test
+files[]=list.test
 required = TRUE
diff --git modules/file/file.info modules/file/file.info
index 675c26b..7dfe744 100644
--- modules/file/file.info
+++ modules/file/file.info
@@ -7,4 +7,4 @@ core = 7.x
 files[] = file.module
 files[] = file.field.inc
 files[] = file.install
-files[] = tests/file.test
+files[] = file.test
diff --git modules/simpletest/simpletest.info modules/simpletest/simpletest.info
index b60c62b..4f63d3d 100644
--- modules/simpletest/simpletest.info
+++ modules/simpletest/simpletest.info
@@ -10,32 +10,3 @@ files[] = simpletest.install
 files[] = simpletest.test
 files[] = drupal_web_test_case.php
 configure = admin/config/development/testing/settings
-
-; Tests in tests directory.
-files[] = tests/actions.test
-files[] = tests/ajax.test
-files[] = tests/batch.test
-files[] = tests/bootstrap.test
-files[] = tests/cache.test
-files[] = tests/common.test
-files[] = tests/database_test.test
-files[] = tests/entity_query.test
-files[] = tests/error.test
-files[] = tests/file.test
-files[] = tests/filetransfer.test
-files[] = tests/form.test
-files[] = tests/graph.test
-files[] = tests/image.test
-files[] = tests/lock.test
-files[] = tests/mail.test
-files[] = tests/menu.test
-files[] = tests/module.test
-files[] = tests/path.test
-files[] = tests/registry.test
-files[] = tests/schema.test
-files[] = tests/session.test
-files[] = tests/theme.test
-files[] = tests/unicode.test
-files[] = tests/update.test
-files[] = tests/xmlrpc.test
-files[] = tests/upgrade/upgrade.test
diff --git modules/system/system.info modules/system/system.info
index 55c5cff..9c1e4fe 100644
--- modules/system/system.info
+++ modules/system/system.info
@@ -17,3 +17,32 @@ files[] = system.updater.inc
 files[] = system.mail.inc
 required = TRUE
 configure = admin/config/system
+
+; Tests in tests directory.
+files[] = tests/actions.test
+files[] = tests/ajax.test
+files[] = tests/batch.test
+files[] = tests/bootstrap.test
+files[] = tests/cache.test
+files[] = tests/common.test
+files[] = tests/database_test.test
+files[] = tests/entity_query.test
+files[] = tests/error.test
+files[] = tests/file.test
+files[] = tests/filetransfer.test
+files[] = tests/form.test
+files[] = tests/graph.test
+files[] = tests/image.test
+files[] = tests/lock.test
+files[] = tests/mail.test
+files[] = tests/menu.test
+files[] = tests/module.test
+files[] = tests/path.test
+files[] = tests/registry.test
+files[] = tests/schema.test
+files[] = tests/session.test
+files[] = tests/theme.test
+files[] = tests/unicode.test
+files[] = tests/update.test
+files[] = tests/xmlrpc.test
+files[] = tests/upgrade.test