diff --git a/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php b/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php
index b7053d3..a939a8b 100644
--- a/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/coder_sniffer/Drupal/Sniffs/Commenting/FunctionCommentSniff.php
@@ -55,6 +55,16 @@ class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_S
      */
     protected $currentFile = null;
 
+    /**
+     * The list of Test class methods that are NOT supposed to have docblocks.
+     *
+     * @var array
+     */
+    protected $noTestClassDocs = array(
+      'getInfo',
+      'setUp',
+      'tearDown',
+    );
 
     /**
      * Returns an array of tokens this test wants to listen for.
@@ -98,16 +108,32 @@ class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_S
         }
 
         // If the token that we found was a class or a function, then this
-        // function has no doc comment.
+        // function has no docblock comment.
         $code = $tokens[$commentEnd]['code'];
 
+        // We can return with no error message if this is one of the Test class
+        // methods that, according to documentation standards, are not supposed
+        // to have a docblock.
+
+        // How does one get filename out of $this->currentFile object?
+        $filename = $this->currentFile->  ??
+
+        if (in_array($this->_methodName, $this->$noTestClassDocs) &&
+          // Is this a test class? Needs to have 'Test' in filename and ends in
+          // '.php'.
+          strpos($filename, 'Test') != FALSE && strpos($filename, '.php') != FALSE) {
+          return;
+        }
+
         if ($code === T_COMMENT) {
-            // The function might actually be missing a comment, and this last comment
-            // found is just commenting a bit of code on a line. So if it is not the
-            // only thing on the line, assume we found nothing.
+            // The function might actually be missing a comment, and this last
+            // comment found is just commenting a bit of code on a line. So if
+            // it is not the only thing on the line, assume we found nothing.
             $prevContent = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, $commentEnd);
+            // @todo This comparison will always be TRUE.  Hence, else cannot be
+            //   reached. Is that really the intent of this comparison?
             if ($tokens[$commentEnd]['line'] === $tokens[$commentEnd]['line']) {
-                $error = 'Missing function doc comment';
+                $error = 'Missing function doc comment (1)';
                 $phpcsFile->addError($error, $stackPtr, 'Missing');
             } else {
                 $error = 'You must use "/**" style comments for a function comment';
@@ -115,7 +141,7 @@ class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_S
             }
             return;
         } else if ($code !== T_DOC_COMMENT) {
-            $error = 'Missing function doc comment';
+            $error = 'Missing function doc comment (2)';
             $phpcsFile->addError($error, $stackPtr, 'Missing');
             return;
         } else if (trim($tokens[$commentEnd]['content']) !== '*/') {
@@ -133,7 +159,7 @@ class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_S
         $ignore[]  = T_FINAL;
         $prevToken = $phpcsFile->findPrevious($ignore, ($stackPtr - 1), null, true);
         if ($prevToken !== $commentEnd) {
-            $phpcsFile->addError('Missing function doc comment', $stackPtr, 'Missing');
+            $phpcsFile->addError('Missing function doc comment (3)', $stackPtr, 'Missing');
             return;
         }
 
@@ -147,15 +173,15 @@ class Drupal_Sniffs_Commenting_FunctionCommentSniff implements PHP_CodeSniffer_S
             }
         }
 
-        // If the first T_OPEN_TAG is right before the comment and does not immediately precede the function
-        // probably a file comment.
+        // If the first T_OPEN_TAG is right before the comment and does not
+        // immediately precede the function probably a file comment.
         $commentStart = ($phpcsFile->findPrevious(T_DOC_COMMENT, ($commentEnd - 1), null, true) + 1);
         $prevToken    = $phpcsFile->findPrevious(T_WHITESPACE, ($commentStart - 1), null, true);
         if ($tokens[$prevToken]['code'] === T_OPEN_TAG) {
             // Is this the first open tag
             if (($stackPtr === 0 || $phpcsFile->findPrevious(T_OPEN_TAG, ($prevToken - 1)) === false)
                 && (($tokens[$commentEnd]['line'] + 1) !== $tokens[$stackPtr]['line'])) {
-                $phpcsFile->addError('Missing function doc comment', $stackPtr, 'Missing');
+                $phpcsFile->addError('Missing function doc comment (4)', $stackPtr, 'Missing');
                 return;
             }
         }