diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php
index 64a46db..0ea8abf 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php
@@ -27,7 +27,7 @@ function setUp() {
   }
 
   /**
-   * Creates a simple form, then POST to system/ajax to change to it.
+   * Submits forms with select and checkbox elements via AJAX.
    */
   function testSimpleAjaxFormValue() {
     // Verify form values of a select element.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php b/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php
index 42605f9..2f56ecd 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php
@@ -147,7 +147,8 @@ function testDrupalFormSubmitInBatch() {
 
   /**
    * Tests batches that return $context['finished'] > 1 do in fact complete.
-   * See http://drupal.org/node/600836
+   *
+   * @see http://drupal.org/node/600836
    */
   function testBatchLargePercentage() {
     // Displaying the page triggers batch 5.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php
index 64cba35..a6f87ef 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php
@@ -41,9 +41,6 @@ function setUp() {
     parent::setUp();
   }
 
-  /**
-   * Resets the static IP address.
-   */
   function tearDown() {
     $_SERVER = $this->oldserver;
     drupal_static_reset('ip_address');
@@ -51,7 +48,7 @@ function tearDown() {
   }
 
   /**
-   * Tests IP Address and hostname.
+   * Tests IP address and hostname.
    */
   function testIPAddressHost() {
     // Test the normal IP address.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php
index fd9648a..c54943f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php
@@ -128,8 +128,7 @@ public function tearDown() {
   }
 
   /**
-   * Tests Drupal\Core\Cache\CacheBackendInterface::get() and
-   * Drupal\Core\Cache\CacheBackendInterface::set().
+   * Tests the get and set methods of Drupal\Core\Cache\CacheBackendInterface.
    */
   public function testSetGet() {
     $backend = $this->getCacheBackend();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php
index b9f1690..c2f1595 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php
@@ -32,9 +32,6 @@ public static function getInfo() {
 
   /**
    * Tests if the theme has been altered.
-   *
-   * @global string $theme
-   * @global array $base_theme_info
    */
   function testDrupalAlter() {
     // This test depends on Bartik, so make sure that it is always the current
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php
index 41d614e..a4cabd6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php
@@ -32,8 +32,6 @@ public static function getInfo() {
 
   /**
    * Checks HTTP requests.
-   *
-   * @global type $is_https
    */
   function testDrupalHTTPRequest() {
     global $is_https;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php
index 03ab0de..473e352 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php
@@ -145,7 +145,7 @@ function testDrupalParseUrl() {
    * Tests url() functionality.
    *
    * Tests url() with/without query, with/without fragment, absolute on/off and
-   * assert all that works when clean URLs are on and off.
+   * asserts all that works when clean URLs are on and off.
    */
   function testUrl() {
     global $base_url, $script_path;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
index 277e9d4..db24ba9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
@@ -90,7 +90,9 @@ function testQueryFetchClass() {
     $this->assertIdentical(count($records), 1, 'There is only one record.');
   }
 
-  // Confirms that we can fetch a record into an indexed array explicitly.
+  /**
+   * Confirms that we can fetch a record into an indexed array explicitly.
+   */
   function testQueryFetchNum() {
     $records = array();
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => PDO::FETCH_NUM));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
index fe876e5..7282071 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Query\NoFieldsException;
 
 /**
- * Inserts tests for "database default" values.
+ * Tests insertion for database default values.
  */
 class InsertDefaultsTest extends DatabaseTestBase {
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
index 67aafbe..4d5ecf1 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
@@ -43,7 +43,7 @@ public static function getInfo() {
   }
 
   /**
-   * Helper method for transaction unit tests.
+   * Encapsulates a transaction's "inner layer" with an "outer layer".
    *
    * This "outer layer" transaction starts and then encapsulates the "inner
    * layer" transaction. This nesting is used to evaluate whether the the
@@ -95,7 +95,7 @@ protected function transactionOuterLayer($suffix, $rollback = FALSE, $ddl_statem
   }
 
   /**
-   * Helper method for transaction unit tests.
+   * Creates an "inner layer" transaction.
    *
    * This "inner layer" transaction is either used alone or nested inside of the
    * "outer layer" transaction.
diff --git a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
index c9c31f6..dfbd7f0 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
+++ b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
@@ -90,7 +90,7 @@ function ajax_forms_test_simple_form_checkbox_callback($form, $form_state) {
 }
 
 /**
- * Forms to display the Ajax Commands.
+ * Form constructor for the Ajax Command display form.
  */
 function ajax_forms_test_ajax_commands_form($form, &$form_state) {
   $form = array();
@@ -424,7 +424,7 @@ function ajax_forms_test_advanced_commands_add_css_callback($form, $form_state)
 }
 
 /**
- * Builds AJAX validation form.
+ * Form constructor for AJAX validation form.
  *
  * This form and its related submit and callback functions demonstrate
  * not validating another form element when a single Ajax element is triggered.
@@ -434,6 +434,8 @@ function ajax_forms_test_advanced_commands_add_css_callback($form, $form_state)
  *
  * The correct behavior is that the Ajax-enabled drivertext element should
  * be able to trigger without causing validation of the "required_field".
+ *
+ * @see ajax_forms_test_validation_form_submit()
  */
 function ajax_forms_test_validation_form($form, &$form_state) {
 
@@ -465,7 +467,9 @@ function ajax_forms_test_validation_form($form, &$form_state) {
 }
 
 /**
- * Tests submit handler for the validation form.
+ * Form submission handler for ajax_forms_test_validation_form().
+ *
+ * @see ajax_forms_test_validation_form()
  */
 function ajax_forms_test_validation_form_submit($form, $form_state) {
   drupal_set_message(t("Validation form submitted"));
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
index b27f8b4..bd4ee5c 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
+++ b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
@@ -75,7 +75,7 @@ function _batch_test_nested_batch_callback() {
 }
 
 /**
- * Performs a common 'finished' callbacks for batches 1 to 4.
+ * Provides a common 'finished' callback for batches 1 to 4.
  */
 function _batch_test_finished_helper($batch_id, $success, $results, $operations) {
   $messages = array("results for batch $batch_id");
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.module b/core/modules/system/tests/modules/batch_test/batch_test.module
index f3da0d0..9852a12 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.module
+++ b/core/modules/system/tests/modules/batch_test/batch_test.module
@@ -93,7 +93,9 @@ function batch_test_menu() {
 }
 
 /**
- * Performs a simple form.
+ * Form constructor for a batch selection form.
+ *
+ * @see batch_test_simple_form_submit()
  */
 function batch_test_simple_form() {
   $form['batch'] = array(
@@ -116,7 +118,9 @@ function batch_test_simple_form() {
 }
 
 /**
- * Triggers submit handler for the simple form.
+ * Form submission handler for batch_test_simple_form().
+ *
+ * @see batch_test_simple_form()
  */
 function batch_test_simple_form_submit($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -129,7 +133,9 @@ function batch_test_simple_form_submit($form, &$form_state) {
 
 
 /**
- * Performs a multistep form.
+ * Form constructor for a multistep form.
+ *
+ * @see batch_test_multistep_form_submit()
  */
 function batch_test_multistep_form($form, &$form_state) {
   if (empty($form_state['storage']['step'])) {
@@ -148,7 +154,9 @@ function batch_test_multistep_form($form, &$form_state) {
 }
 
 /**
- * Submits handler for the multistep form.
+ * Form submission handler for batch_test_multistep_form().
+ *
+ * @see batch_test_multistep_form()
  */
 function batch_test_multistep_form_submit($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -172,7 +180,12 @@ function batch_test_multistep_form_submit($form, &$form_state) {
 }
 
 /**
- * Tests a form with chained submit callbacks.
+ * Form constructor for a form with chained submit callbacks.
+ *
+ * @see batch_test_chained_form_submit_1()
+ * @see batch_test_chained_form_submit_3()
+ * @see batch_test_chained_form_submit_3()
+ * @see batch_test_chained_form_submit_4()
  */
 function batch_test_chained_form() {
   // This value is used to test that $form_state persists through batched
@@ -197,7 +210,9 @@ function batch_test_chained_form() {
 }
 
 /**
- * Triggers submit handler #1 for the chained form.
+ * Form submission handler #1 for batch_test_chained_form().
+ *
+ * @see batch_test_chained_form()
  */
 function batch_test_chained_form_submit_1($form, &$form_state) {
   batch_test_stack(NULL, TRUE);
@@ -213,7 +228,9 @@ function batch_test_chained_form_submit_1($form, &$form_state) {
 }
 
 /**
- * Triggers submit handler #2 for the chained form.
+ * Form submission handler #2 for batch_test_chained_form().
+ *
+ * @see batch_test_chained_form()
  */
 function batch_test_chained_form_submit_2($form, &$form_state) {
   batch_test_stack('submit handler 2');
@@ -227,7 +244,9 @@ function batch_test_chained_form_submit_2($form, &$form_state) {
 }
 
 /**
- * Triggers submit handler #3 for the chained form.
+ * Form submission handler #3 for batch_test_chained_form().
+ *
+ * @see batch_test_chained_form()
  */
 function batch_test_chained_form_submit_3($form, &$form_state) {
   batch_test_stack('submit handler 3');
@@ -240,7 +259,9 @@ function batch_test_chained_form_submit_3($form, &$form_state) {
 }
 
 /**
- * Triggers submit handler #4 for the chained form.
+ * Form submission handler #4 for batch_test_chained_form().
+ *
+ * @see batch_test_chained_form()
  */
 function batch_test_chained_form_submit_4($form, &$form_state) {
   batch_test_stack('submit handler 4');
@@ -277,7 +298,7 @@ function batch_test_nested_drupal_form_submit($value = 1) {
 }
 
 /**
- * Batch operation: Submits form_test_mock_form using drupal_form_submit().
+ * Batch operation: Submits form_test_mock_form() using drupal_form_submit().
  */
 function _batch_test_nested_drupal_form_submit_callback($value) {
   $state['values']['test_value'] = $value;
@@ -285,7 +306,9 @@ function _batch_test_nested_drupal_form_submit_callback($value) {
 }
 
 /**
- * Returns a simple form with a textfield and submit button.
+ * Form constructor for a simple form with a textfield and submit button.
+ *
+ * @see batch_test_mock_form_submit()
  */
 function batch_test_mock_form($form, $form_state) {
   $form['test_value'] = array(
@@ -300,7 +323,9 @@ function batch_test_mock_form($form, $form_state) {
 }
 
 /**
- * Triggers submit handler for the batch_test_mock() form.
+ * Form submission handler for batch_test_mock_form().
+ *
+ * @see batch_test_mock_form()
  */
 function batch_test_mock_form_submit($form, &$form_state) {
   batch_test_stack('mock form submitted with value = ' . $form_state['values']['test_value']);
@@ -334,7 +359,7 @@ function batch_test_redirect_page() {
 }
 
 /**
- * Batch 0: Operates nothing.
+ * Batch 0: Does nothing.
  */
 function _batch_test_batch_0() {
   $batch = array(
diff --git a/core/modules/system/tests/modules/common_test/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module
index d16d3dc..0634e3b 100644
--- a/core/modules/system/tests/modules/common_test/common_test.module
+++ b/core/modules/system/tests/modules/common_test/common_test.module
@@ -76,14 +76,18 @@ function common_test_drupal_goto_redirect_advanced() {
 }
 
 /**
- * This is a landing a page for drupal_goto().
+ * Page callback: Provides a landing page for drupal_goto().
+ *
+ * @see common_test_menu()
  */
 function common_test_drupal_goto_land() {
   print "drupal_goto";
 }
 
 /**
- * This is a failure landing page for drupal_goto().
+ * Page callback: Provides a failure landing page for drupal_goto().
+ *
+ * @see common_test_menu()
  */
 function common_test_drupal_goto_land_fail() {
   print "drupal_goto_fail";
@@ -227,7 +231,7 @@ function common_test_theme() {
 }
 
 /**
- * Testing a theme function for drupal_render() theming.
+ * Provides a theme function for drupal_render().
  */
 function theme_common_test_foo($variables) {
   return $variables['foo'] . $variables['bar'];