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.43
diff -u -r1.2.2.3.2.43 drupal_web_test_case.php
--- drupal_web_test_case.php	14 Sep 2009 23:22:56 -0000	1.2.2.3.2.43
+++ drupal_web_test_case.php	17 Sep 2009 21:31:59 -0000
@@ -557,8 +557,10 @@
     $this->originalFileDirectory = file_directory_path();
 
     // Generate temporary prefixed database to ensure that tests have a clean starting point.
-    $db_prefix = Database::getConnection()->prefixTables('{simpletest' . mt_rand(1000, 1000000) . '}');
-    $conf['file_public_path'] = $this->originalFileDirectory . '/' . $db_prefix;
+//    $db_prefix = Database::getConnection()->prefixTables('{simpletest' . mt_rand(1000, 1000000) . '}');
+    $db_prefix = $db_prefix . 'simpletest' . mt_rand(1000, 1000000);
+//    $conf['file_public_path'] = $this->originalFileDirectory . '/' . $db_prefix;
+    $conf['file_directory_path'] = $this->originalFileDirectory . '/simpletest/' . substr($db_prefix, 10);
 
     // If locale is enabled then t() will try to access the database and
     // subsequently will fail as the database is not accessible.
@@ -573,7 +575,8 @@
   function tearDown() {
     global $db_prefix, $conf;
     if (preg_match('/simpletest\d+/', $db_prefix)) {
-      $conf['file_public_path'] = $this->originalFileDirectory;
+//      $conf['file_public_path'] = $this->originalFileDirectory;
+      $conf['file_directory_path'] = $this->originalFileDirectory;
       // Return the database prefix to the original.
       $db_prefix = $this->originalPrefix;
       // Restore modules if necessary.