diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test
index a4764f868495f2932cbe3343aedeaa3fb1782b32..cfd3b6cd8cf51dd1545311e0f08d9aaa8f322e81 100644
--- a/modules/aggregator/aggregator.test
+++ b/modules/aggregator/aggregator.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Creates tests for aggregator module.
+ * Tests for aggregator.module.
  */
 
 class AggregatorTestCase extends DrupalWebTestCase {
diff --git a/modules/block/block.test b/modules/block/block.test
index 67e503aa3ac61130b367ec24a7980a9632deedd7..2f0a2daf872b4dc9faf97b21af59fb516b29ee14 100644
--- a/modules/block/block.test
+++ b/modules/block/block.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the block module
+ * Tests for block.module.
  */
 
 class BlockTestCase extends DrupalWebTestCase {
diff --git a/modules/blog/blog.test b/modules/blog/blog.test
index 521f5f064769e8d4092bb1bd20cb8326d4487ad8..600cbd274a2db0bff4cff56eec3b824cfd3f977e 100644
--- a/modules/blog/blog.test
+++ b/modules/blog/blog.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for blog.module.
+ */
+
 class BlogTestCase extends DrupalWebTestCase {
   protected $big_user;
   protected $own_user;
diff --git a/modules/book/book.test b/modules/book/book.test
index 6ac63f0600481de4c7e150f84b52252f15784779..c48a2cbfd3328a8cf529a1a8d5f1b4c52cdeba48 100644
--- a/modules/book/book.test
+++ b/modules/book/book.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for book.module.
+ */
+
 class BookTestCase extends DrupalWebTestCase {
   protected $book;
   // $book_author is a user with permission to create and edit books.
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index a76d89c9606895c3ceab084033d14f8fec4d0a9b..ed4b2de33c18ef40e5b407cd9a63fc43ab4ad201 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file 
+ * Tests for comment.module.
+ */
+
 class CommentHelperCase extends DrupalWebTestCase {
   protected $admin_user;
   protected $web_user;
diff --git a/modules/contact/contact.test b/modules/contact/contact.test
index 80a157b87d355d1ede5ee39b053069293aa491ff..bd669c5981dafb3349210298d355344c4e3af206 100644
--- a/modules/contact/contact.test
+++ b/modules/contact/contact.test
@@ -2,8 +2,10 @@
 // $Id$
 
 /**
- * Test the sitewide contact form.
+ * @file 
+ * Tests for contact.module.
  */
+
 class ContactSitewideTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
diff --git a/modules/dashboard/dashboard.test b/modules/dashboard/dashboard.test
index 89a3932303586ac6874db4eecef2ebda770c4570..11b88281a1bfd2674b3c72e39bc5ec3df8e2a68d 100644
--- a/modules/dashboard/dashboard.test
+++ b/modules/dashboard/dashboard.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the dashboard module.
+ * Tests for dashboard.module.
  */
 
 class DashboardBlocksTestCase extends DrupalWebTestCase {
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index 19cf0f448735b50fc67a2acec10dd1caed74be64..4a024609d8693a44e3d051d2bdcfb37df3d848a1 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for dblog.module.
+ */
+
 class DBLogTestCase extends DrupalWebTestCase {
   protected $big_user;
   protected $any_user;
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.test b/modules/field/modules/field_sql_storage/field_sql_storage.test
index 4a6f96a52134b5cedd9ceda752f0db6e5bcf5c0f..fb18836b4b5dd14eb186d9a6a12f8f88a21e07b9 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.test
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Unit tests for field_sql_ storage.module
+ * Tests for field_sql_storage.module.
  *
  * Field_sql_storage.module implements the default back-end storage plugin
  * for the Field Strage API.
diff --git a/modules/field/modules/list/tests/list.test b/modules/field/modules/list/tests/list.test
index 571648702a2630e9b6dd0debb6d0bd85b9bb08cc..48300cc0b31e40ddefd4a3fbc49d067453dcdb44 100644
--- a/modules/field/modules/list/tests/list.test
+++ b/modules/field/modules/list/tests/list.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the 'List' field types.
+ * Tests for list.module.
  */
 
 /**
diff --git a/modules/field/modules/number/number.test b/modules/field/modules/number/number.test
index a15b6e6aaf2247b63ad2d15233c1f0012fe2a67e..5e2b6acf97763fa3cf2eec2567367058065a8701 100644
--- a/modules/field/modules/number/number.test
+++ b/modules/field/modules/number/number.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for number field types.
+ * Tests for number.module.
  */
 
 /**
diff --git a/modules/field/modules/options/options.test b/modules/field/modules/options/options.test
index 31d2617ff317d9a1007fa960c5b656a3ddb43ab3..13d91909dae3dd56cdeb7eb27719515c90995911 100644
--- a/modules/field/modules/options/options.test
+++ b/modules/field/modules/options/options.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file 
+ * Tests for options.module.
+ */
+
 class OptionsWidgetsTestCase extends FieldTestCase {
   public static function getInfo() {
     return array(
diff --git a/modules/field/modules/text/text.test b/modules/field/modules/text/text.test
index ee71414cf60e0d6952149caa780200a6a3c43d89..bf1d1b15910015fa218648436a8221cea3a4c168 100644
--- a/modules/field/modules/text/text.test
+++ b/modules/field/modules/text/text.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for text.module.
+ */
+
 class TextFieldTestCase extends DrupalWebTestCase {
   protected $instance;
   protected $admin_user;
diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test
index 231e579411725d904aa7e92c3ebab69b1c872918..3363237744edf8b89d38517657ffd3e3b0934df4 100644
--- a/modules/field/tests/field.test
+++ b/modules/field/tests/field.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Unit test file for fields in core.
+ * Tests for field.module.
  */
 
 /**
diff --git a/modules/field_ui/field_ui.test b/modules/field_ui/field_ui.test
index e67fc2bb75db8675aebc136ac6a155180a150159..1bf666c874c57bef92e6940bdacb86583815ca4b 100644
--- a/modules/field_ui/field_ui.test
+++ b/modules/field_ui/field_ui.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Unit test file for fields in core UI.
+ * Tests for field_ui.module.
  */
 
 /**
diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test
index bf74b8b719c70a5fe69adadb8570fd23897f596a..9794ea7c192d2b24f704f254f92c077275ca471b 100644
--- a/modules/file/tests/file.test
+++ b/modules/file/tests/file.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests file uploading through the File module.
+ * Tests for file.module.
  */
 
 /**
diff --git a/modules/filter/filter.test b/modules/filter/filter.test
index e878477c153e725f9cd8e9b8f9140a44e88bc64c..e8b8058c475f172f10b50716631a3b30f44b5725 100644
--- a/modules/filter/filter.test
+++ b/modules/filter/filter.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for filter.module.
+ */
+
 /**
  * Tests for text format and filter CRUD operations.
  */
diff --git a/modules/forum/forum.test b/modules/forum/forum.test
index d1fe188dd4d0fc0849091e26cbbb64733b20e39a..615e24a177e461cc666c6825ff6e6760bffc0aeb 100644
--- a/modules/forum/forum.test
+++ b/modules/forum/forum.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for forum.module.
+ */
+
 class ForumTestCase extends DrupalWebTestCase {
   protected $admin_user;
   protected $edit_own_topics_user;
diff --git a/modules/help/help.test b/modules/help/help.test
index 8033c4c0e605fb6350ceecabbedaac99d483d8c6..b434b647873ee8e2905bff256476518f7d827c22 100644
--- a/modules/help/help.test
+++ b/modules/help/help.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for help.module.
+ */
+
 class HelpTestCase extends DrupalWebTestCase {
   protected $big_user;
   protected $any_user;
diff --git a/modules/image/image.test b/modules/image/image.test
index 7529add7525078e0e88d70fae691ca922e382607..94e51ab6c10b76d88dd8577e634028ced0592a52 100644
--- a/modules/image/image.test
+++ b/modules/image/image.test
@@ -3,10 +3,9 @@
 
 /**
  * @file
- * Image module tests.
+ * Tests for image.module.
  */
 
-
 /**
  * TODO: Test the following functions.
  *
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index d103adedc37a8ed041d75590df2e66ba1bb0e42b..006c36b9fad1f9b225bb83676a59525964209069 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for Locale module.
+ * Tests for locale.module.
  *
  * The test file includes:
  *  - a functional test for the language configuration forms;
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index a90fbfb288e365e37424fb307e920488b23c66b9..5d8d53efd10f565a6b1780a13f7dc8f506b14106 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests file for the menu module.
+ * Tests for menu.module.
  */
 
 class MenuTestCase extends DrupalWebTestCase {
diff --git a/modules/node/node.test b/modules/node/node.test
index 3e0db8615d56bd24fcddf6beae0c00debe90dc0f..d9d0c87a9ab41b7aac5b15c63a6d15fcdefc6edf 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for node.module.
+ */
+
 /**
  * Test the node_load_multiple() function.
  */
diff --git a/modules/openid/openid.test b/modules/openid/openid.test
index 9fe888b458df04ab0355cbaff406ffcccff408d7..f042d889979f1232e68ca7f43392056076ac19d4 100644
--- a/modules/openid/openid.test
+++ b/modules/openid/openid.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for openid.module.
+ */
+
 /**
  * Base class for OpenID tests.
  */
diff --git a/modules/path/path.test b/modules/path/path.test
index ad536ace581c9776387f9e5a28e0c00a32fdffa8..538ce5dd286c04d9a7cfce86775b9318b2804bc4 100644
--- a/modules/path/path.test
+++ b/modules/path/path.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the path module
+ * Tests for path.module.
  */
 
 class PathTestCase extends DrupalWebTestCase {
diff --git a/modules/php/php.test b/modules/php/php.test
index 10079d67a0d9d1b7e1252353e11fa4ca2ca5a3f2..e4da6a3e65ff6c048b03fa031ad2a923f9f39ba6 100644
--- a/modules/php/php.test
+++ b/modules/php/php.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for php.module.
+ */
+
 /**
  * Base PHP test case class.
  */
diff --git a/modules/poll/poll.test b/modules/poll/poll.test
index ba1a53553e9fdbd8ea03e330e38d59ef8b9b0553..c22cc3570dd47fd8cb316aee65c48990c7ef7351 100644
--- a/modules/poll/poll.test
+++ b/modules/poll/poll.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the poll module.
+ * Tests for poll.module.
  */
 
 class PollTestCase extends DrupalWebTestCase {
diff --git a/modules/profile/profile.test b/modules/profile/profile.test
index 3eb471fd8651d6dd71c72c1ad6f7f6635155281b..1cf6067ecc0e15c3409c00442194f4ccdcdf84f4 100644
--- a/modules/profile/profile.test
+++ b/modules/profile/profile.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for profile.module.
+ */
+
 /**
  * A class for common methods for testing profile fields.
  */
diff --git a/modules/rdf/rdf.test b/modules/rdf/rdf.test
index 0d20345ad9bdcc03385b3ae794dc05982adaf955..cd9c2d13ba9c3248ba1f61dcecd44cf1cbce2f14 100644
--- a/modules/rdf/rdf.test
+++ b/modules/rdf/rdf.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for RDF functionality.
+ * Tests for rdf.module.
  */
 
 class RdfMappingHookTestCase extends DrupalWebTestCase {
diff --git a/modules/search/search.test b/modules/search/search.test
index 589aa5540ac686d17748c598ffdf68cf300c8e3a..1586bd68fd2e899a944a609db9d4109836e6733b 100644
--- a/modules/search/search.test
+++ b/modules/search/search.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for search.module.
+ */
+
 // The search index can contain different types of content. Typically the type is 'node'.
 // Here we test with _test_ and _test2_ as the type.
 define('SEARCH_TYPE', '_test_');
diff --git a/modules/shortcut/shortcut.test b/modules/shortcut/shortcut.test
index 3c5a4f34edbd9150fb0242c7b31f4803ce87df3a..6e61120e1f6299971b9cd501f61ea79307b5e648 100644
--- a/modules/shortcut/shortcut.test
+++ b/modules/shortcut/shortcut.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for the shortcut module.
+ * Tests for shortcut.module.
  */
 
 /**
diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test
index 469d2c168470e9438ed159aab99a6350a13ca0dd..0851dccca260d59eaebda3a0cac8ab86a771aad3 100644
--- a/modules/simpletest/simpletest.test
+++ b/modules/simpletest/simpletest.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for simpletest.module.
+ */
+
 class SimpleTestFunctionalTest extends DrupalWebTestCase {
   /**
    * The results array that has been parsed by getTestResults().
diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test
index 98f35b45cd5fa66dfcb0c96f626a7ea913cad13e..47ae88011e6be0de286ba90b2901d6c46ff200ce 100644
--- a/modules/statistics/statistics.test
+++ b/modules/statistics/statistics.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for statistics.module.
+ */
+
 /**
  * Sets up a base class for the Statistics module.
  */
diff --git a/modules/syslog/syslog.test b/modules/syslog/syslog.test
index 4f0950dd974554cb9a41a755b7ef30028a260652..76096b7be41e450e0a034037eb66da9a0f084e52 100644
--- a/modules/syslog/syslog.test
+++ b/modules/syslog/syslog.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for syslog.module.
+ */
+
 class SyslogTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
diff --git a/modules/system/system.test b/modules/system/system.test
index 549df44b09a84a589cc44eb28d55a9e302fbf6f1..44d5692b34eef61e5a6cf223d01897b5f230b4af 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for system.module.
+ */
+
 /**
  * Helper class for module test cases.
  */
diff --git a/modules/taxonomy/taxonomy.test b/modules/taxonomy/taxonomy.test
index 0664c523aa85612bf85ebd009d07babc9e7dd813..cec8c77bc78cb8ba9bcc7c610d7bf5cd7b2b291e 100644
--- a/modules/taxonomy/taxonomy.test
+++ b/modules/taxonomy/taxonomy.test
@@ -3,7 +3,7 @@
 
 /**
  * @file
- * Tests for Taxonomy module.
+ * Tests for taxonomy.module.
  */
 
 /**
diff --git a/modules/tracker/tracker.test b/modules/tracker/tracker.test
index f3f742e8c2279add02943a9260e78f8651546c4b..902eef205741626c0a22fc7224d5b7c95a6f4c7a 100644
--- a/modules/tracker/tracker.test
+++ b/modules/tracker/tracker.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for tracker.module.
+ */
+
 class TrackerTest extends DrupalWebTestCase {
   protected $user;
   protected $other_user;
diff --git a/modules/translation/translation.test b/modules/translation/translation.test
index 701e3dcfdff95957d69070d1c7e75305969214a2..4a640bc4bc90e348c31c23546e9d1a0c82c845e6 100644
--- a/modules/translation/translation.test
+++ b/modules/translation/translation.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for translation.module
+ */
+
 class TranslationTestCase extends DrupalWebTestCase {
   protected $book;
 
diff --git a/modules/trigger/trigger.test b/modules/trigger/trigger.test
index a9fbffec36ce4111be08f95f4fe381f409aaffab..c1caac0b6d9bce9037a44fd3e19f761597d8bc1b 100644
--- a/modules/trigger/trigger.test
+++ b/modules/trigger/trigger.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for trigger.module.
+ */
+
 /**
  * Provides common helper methods.
  */
diff --git a/modules/update/update.test b/modules/update/update.test
index a1252dcde8e977e4a14a198dd95e60e3e64693b2..1f88c5f80c448f28fc76afccfba8c3ee4945f162 100644
--- a/modules/update/update.test
+++ b/modules/update/update.test
@@ -3,6 +3,8 @@
 
 /**
  * @file
+ * Tests for update.module.
+ *
  * This file contains tests for the update module. The overarching methodology
  * of these tests is we need to compare a given state of installed modules and
  * themes (e.g. version, project grouping, timestamps, etc) vs. a current
diff --git a/modules/user/user.test b/modules/user/user.test
index 31e19e267f4d8f5523c95ebfeb11ff283a1aa22f..4d5b0a8637f15cbfa0a88b095789e92b5d72b38a 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Tests for user.module.
+ */
+
 class UserRegistrationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(