Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.123
diff -u -r1.123 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php	8 Jul 2009 07:23:23 -0000	1.123
+++ modules/simpletest/drupal_web_test_case.php	8 Jul 2009 20:20:55 -0000
@@ -2425,7 +2425,7 @@
    */
   protected function verbose($message) {
     if ($id = simpletest_verbose($message)) {
-      $this->pass(l(t('Verbose message'), url($this->originalFileDirectory . '/simpletest/verbose.html', array('fragment' => $id))), 'Debug');
+      $this->pass(l(t('Verbose message'), $this->originalFileDirectory . '/simpletest/verbose.html', array('fragment' => $id)), 'Debug');
     }
   }
 }
@@ -2464,8 +2464,10 @@
  */
 function simpletest_verbose($message, $original_file_directory = NULL) {
   static $file_directory = NULL, $id = 0;
+  $verbose = &drupal_static(__FUNCTION__);
 
-  if (variable_get('simpletest_verbose', FALSE) || TRUE) {
+  // Will pass first time during setup phase, and when verbose is TRUE.
+  if (!$original_file_directory && !$verbose) {
     return FALSE;
   }
 
@@ -2477,6 +2479,7 @@
 
   if ($original_file_directory) {
     $file_directory = $original_file_directory;
+    $verbose = variable_get('simpletest_verbose', FALSE);
 
     // Clear out the previous log.
     $message = t('Starting verbose log at @time.', array('@time' => format_date(time()))) . "\n";