Index: core/drupal_web_test_case.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/core/Attic/drupal_web_test_case.inc,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 drupal_web_test_case.inc
--- core/drupal_web_test_case.inc	8 Feb 2009 02:35:39 -0000	1.1.2.1
+++ core/drupal_web_test_case.inc	21 Feb 2009 13:14:42 -0000
@@ -824,6 +824,7 @@
 
     // Store necessary current values before switching to prefixed database.
     $this->originalPrefix = $db_prefix;
+    $this->originalFileDirectory = file_directory_path();
     $clean_url_original = variable_get('clean_url', 0);
 
     // Generate temporary prefixed database to ensure that tests have a clean starting point.
@@ -867,8 +868,7 @@
     variable_set('site_mail', 'simpletest@example.com');
 
     // Use temporary files directory with the same prefix as database.
-    $this->originalFileDirectory = file_directory_path();
-    variable_set('file_directory_path', file_directory_path() . '/' . $db_prefix);
+    variable_set('file_directory_path', $this->originalFileDirectory . '/' . $db_prefix);
     $directory = file_directory_path();
     file_check_directory($directory, FILE_CREATE_DIRECTORY); // Create the files directory.
     set_time_limit($this->timeLimit);
Index: drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.2.2.3.2.31
diff -u -r1.2.2.3.2.31 drupal_web_test_case.php
--- drupal_web_test_case.php	18 Feb 2009 03:36:25 -0000	1.2.2.3.2.31
+++ drupal_web_test_case.php	21 Feb 2009 13:14:40 -0000
@@ -276,6 +276,7 @@
 
     // Store necessary current values before switching to prefixed database.
     $this->originalPrefix = $db_prefix;
+    $this->originalFileDirectory = file_directory_path();
     $clean_url_original = variable_get('clean_url', 0);
 
     // Must reset locale here, since schema calls t().  (Drupal 6)
@@ -330,8 +331,7 @@
     variable_set('site_mail', 'simpletest@example.com');
 
     // Use temporary files directory with the same prefix as database.
-    $this->originalFileDirectory = file_directory_path();
-    variable_set('file_directory_path', file_directory_path() . '/' . $db_prefix);
+    variable_set('file_directory_path', $this->originalFileDirectory . '/' . $db_prefix);
     $directory = file_directory_path();
     file_check_directory($directory, FILE_CREATE_DIRECTORY); // Create the files directory.
     set_time_limit($this->timeLimit);