diff --git a/coder_review/includes/coder_review_comment.inc b/coder_review/includes/coder_review_comment.inc
index e2f266d..7d17d2e 100644
--- a/coder_review/includes/coder_review_comment.inc
+++ b/coder_review/includes/coder_review_comment.inc
@@ -44,16 +44,9 @@ function coder_review_comment_reviews() {
     array(
       '#type' => 'regex',
       '#source' => 'comment',
-      '#value' => '\/\/\s*\@see\s*',
-      '#warning_callback' => '_coder_review_comment_see_comment_style_warning',
-      '#severity' => 'minor',
-    ),
-    array(
-      '#type' => 'regex',
-      '#source' => 'comment',
       '#value' => '\@see\s*.*',
       '#not' => '^\@see\s+((\w+\(\)|[\w\.\-\?\/:\&=]+\.[\w\.\->\?\/:\&=]+)[,\s]+)*(\w+\(\)|[\w\.\->\?\/:\&=]+\.[\w\.\->\?\/:\&=]+)\W*$',
-      '#warning' => '@see should always be followed by a filename, a url or a function name with ()',
+      '#warning' => '@see should always be followed by a filename, a URL, class/interface name (optionally including method), or a function name including ().',
       '#severity' => 'minor',
     ),
     array(
@@ -200,13 +193,6 @@ function _coder_review_comment_invalid_file_block_warning() {
   );
 }
 
-function _coder_review_comment_see_comment_style_warning() {
-  return array(
-    '#warning' => t('@' . 'see should always be in a comment block rather than as an inline comment.'),
-    '#link' => 'http://drupal.org/node/1354',
-  );
-}
-
 function _coder_review_comment_Id_warning() {
   return array(
     '#warning' => t('Commits to the Git repository do not require the CVS $Id' . '$ keyword in each file.'),
diff --git a/coder_review/tests/coder_review_comment.test b/coder_review/tests/coder_review_comment.test
index c5a009e..c70a6ee 100644
--- a/coder_review/tests/coder_review_comment.test
+++ b/coder_review/tests/coder_review_comment.test
@@ -67,7 +67,12 @@ class CoderReviewCommentTest extends CoderReviewTestCase {
     $this->assertCoderReviewFail($this->comment_header . "/**\n * @see some_function().");
     $this->assertCoderReviewFail($this->comment_header . "/**\n * @see some_function(), foo.tpl.php.");
     $this->assertCoderReviewFail($this->comment_header . "/**\n * @see\n * some_function()");
-    $this->assertCoderReviewFail($this->comment_header . "// @see some_function()");
+
+    $this->assertCoderReviewPass($this->comment_header . "// @see some_function()");
+    $this->assertCoderReviewPass($this->comment_header . "// @see foo.tpl.php");
+    $this->assertCoderReviewPass($this->comment_header . "// @see some_function(), foo.tpl.php");
+
+    $this->assertCoderReviewFail($this->comment_header . "// @see some_function");
   }
 
 }
diff --git a/coder_review/tests/coder_review_test_case.tinc b/coder_review/tests/coder_review_test_case.tinc
index c81dcf8..de8ea69 100644
--- a/coder_review/tests/coder_review_test_case.tinc
+++ b/coder_review/tests/coder_review_test_case.tinc
@@ -63,13 +63,10 @@ class CoderReviewTestCase extends DrupalUnitTestCase {
     $results = $this->runTest($code);
 
     // Display the test results.
-    $message = 'Pass:'. str_replace(array('%s', '%d'), array('%%s', '%%d'), $code);
-    if (count($results) == 0) {
-      $this->assertTrue(TRUE, check_plain($message));
-    }
-    else {
-      $this->assertTrue(FALSE, check_plain($message) .': '. $this->getWarnings($results));
-    }
+    $message = 'Pass: ';
+    $message .= $this->getWarnings($results);
+    $message .= '<pre>' . check_plain(str_replace(array('%s', '%d'), array('%%s', '%%d'), $code)) . '</pre>';
+    $this->assertTrue(count($results) == 0, $message);
   }
 
   protected function assertCoderReviewFail($code) {
@@ -77,13 +74,10 @@ class CoderReviewTestCase extends DrupalUnitTestCase {
     $results = $this->runTest($code);
 
     // Display the test results.
-    $message = 'Fail:'. str_replace(array('%s', '%d'), array('%%s', '%%d'), $code);
-    if (count($results) <= 1) {
-      $this->assertTrue(count($results) == 1, check_plain($message));
-    }
-    else {
-      $this->assertTrue(FALSE, check_plain($message) .': '. $this->getWarnings($results));
-    }
+    $message = 'Fail: ';
+    $message .= $this->getWarnings($results);
+    $message .= '<pre>' . check_plain(str_replace(array('%s', '%d'), array('%%s', '%%d'), $code)) . '</pre>';
+    $this->assertTrue(count($results), $message);
   }
   
   private function getWarnings($results) {