2 files changed, 6 insertions, 5 deletions
diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test
index 0644d3910..46931e69b 100644
--- a/modules/simpletest/tests/file.test
+++ b/modules/simpletest/tests/file.test
@@ -826,7 +826,7 @@ class FileScanDirectoryTest extends FileTestCase {
 
   function setUp() {
     parent::setUp();
-    $this->path = $this->originalFileDirectory . '/simpletest';
+    $this->path = drupal_get_path('module', 'simpletest') . '/files';
   }
 
   /**
@@ -920,10 +920,10 @@ class FileScanDirectoryTest extends FileTestCase {
    * Check that the recurse option decends into subdirectories.
    */
   function testOptionRecurse() {
-    $files = file_scan_directory($this->originalFileDirectory, '/^javascript-/', array('recurse' => FALSE));
+    $files = file_scan_directory(drupal_get_path('module', 'simpletest'), '/^javascript-/', array('recurse' => FALSE));
     $this->assertTrue(empty($files), t("Without recursion couldn't find javascript files."));
 
-    $files = file_scan_directory($this->originalFileDirectory, '/^javascript-/', array('recurse' => TRUE));
+    $files = file_scan_directory(drupal_get_path('module', 'simpletest'), '/^javascript-/', array('recurse' => TRUE));
     $this->assertEqual(2, count($files), t('With recursion we found the expected javascript files.'));
   }
 
diff --git a/modules/simpletest/tests/image.test b/modules/simpletest/tests/image.test
index 5ebd6bdc2..7c4c3c76a 100644
--- a/modules/simpletest/tests/image.test
+++ b/modules/simpletest/tests/image.test
@@ -21,7 +21,8 @@ class ImageToolkitTestCase extends DrupalWebTestCase {
     $this->toolkit = 'test';
 
     // Pick a file for testing.
-    $this->file = $this->originalFileDirectory . '/simpletest/image-test.png';
+    $file = current($this->drupalGetTestFiles('image'));
+    $this->file = $file->uri;
 
     // Setup a dummy image to work with, this replicate image_load() so we
     // can avoid calling it.
@@ -382,7 +383,7 @@ class ImageToolkitGdTestCase extends DrupalWebTestCase {
     foreach ($files as $file) {
       foreach ($operations as $op => $values) {
         // Load up a fresh image.
-        $image = image_load($this->originalFileDirectory . '/simpletest/' . $file, 'gd');
+        $image = image_load(drupal_get_path('module', 'simpletest') . '/files/' . $file, 'gd');
         if (!$image) {
           $this->fail(t('Could not load image %file.', array('%file' => $file)));
           continue 2;