3 files changed, 8 insertions, 8 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index be73e5933..1971d92f5 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -686,7 +686,7 @@ class DrupalWebTestCase {
     // Generate temporary prefixed database to ensure that tests have a clean starting point.
     $db_prefix = 'simpletest' . mt_rand(1000, 1000000);
 
-    include_once './includes/install.inc';
+    include_once DRUPAL_ROOT . '/includes/install.inc';
     drupal_install_system();
 
     // Add the specified modules to the list of modules in the default profile.
diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module
index 138045f83..ff338b12f 100644
--- a/modules/simpletest/simpletest.module
+++ b/modules/simpletest/simpletest.module
@@ -424,7 +424,7 @@ function _simpletest_batch_finished($success, $results, $operations) {
 function simpletest_get_all_tests() {
   static $formatted_classes;
   if (!isset($formatted_classes)) {
-    require_once drupal_get_path('module', 'simpletest') . '/drupal_web_test_case.php';
+    require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'simpletest') . '/drupal_web_test_case.php';
     $files = array();
     foreach (array_keys(module_rebuild_cache()) as $module) {
       $module_path = drupal_get_path('module', $module);
@@ -443,7 +443,7 @@ function simpletest_get_all_tests() {
 
     $existing_classes = get_declared_classes();
     foreach ($files as $file) {
-      include_once($file);
+      include_once DRUPAL_ROOT . '/' . $file;
     }
     $classes = array_values(array_diff(get_declared_classes(), $existing_classes));
     $formatted_classes = array();
diff --git a/modules/simpletest/tests/registry.test b/modules/simpletest/tests/registry.test
index 13bfa9074..a167178b6 100644
--- a/modules/simpletest/tests/registry.test
+++ b/modules/simpletest/tests/registry.test
@@ -89,11 +89,11 @@ class RegistryParseFilesTestCase extends DrupalWebTestCase {
       if ($fileType == 'existing_changed') {
         // Insert a record with a dodgy md5.
         $this->$fileType->fakeMD5 = md5($this->$fileType->contents . rand());
-        db_query("INSERT INTO {registry_file} (md5, filename) VALUES ('%s', '%s')", $this->$fileType->fakeMD5, './' . $this->$fileType->fileName);
+        db_query("INSERT INTO {registry_file} (md5, filename) VALUES ('%s', '%s')", $this->$fileType->fakeMD5, $this->$fileType->fileName);
 
         // Insert some fake resource records.
         foreach (array('function', 'class', 'interface') as $type) {
-          db_query("INSERT INTO {registry} (name, type, filename) VALUES ('%s', '%s', '%s')", $type . md5(rand()), $type, './' . $this->$fileType->fileName);
+          db_query("INSERT INTO {registry} (name, type, filename) VALUES ('%s', '%s', '%s')", $type . md5(rand()), $type, $this->$fileType->fileName);
         }
       }
     }
@@ -111,7 +111,7 @@ class RegistryParseFilesTestCase extends DrupalWebTestCase {
         $this->assertTrue($this->$fileType->$resource == $foundName, t('Resource "@resource" found.', array('@resource' => $this->$fileType->$resource)));
       }
       // Test that we have the right md5.
-      $md5 = db_result(db_query("SELECT md5 FROM {registry_file} WHERE filename = '%s'", './' . $this->$fileType->fileName));
+      $md5 = db_result(db_query("SELECT md5 FROM {registry_file} WHERE filename = '%s'", $this->$fileType->fileName));
       $this->assertTrue(md5($this->$fileType->contents) == $md5, t('MD5 for "@filename" matched.' . $fileType . $md5, array('@filename' => $this->$fileType->fileName)));
     }
   }
@@ -123,10 +123,10 @@ class RegistryParseFilesTestCase extends DrupalWebTestCase {
     $files = array();
     foreach ($this->fileTypes as $fileType) {
       if ($fileType == 'existing_changed') {
-        $files['./' . $this->$fileType->fileName] = array('md5' => $this->$fileType->fakeMD5);
+        $files[$this->$fileType->fileName] = array('md5' => $this->$fileType->fakeMD5);
       }
       else {
-        $files['./' . $this->$fileType->fileName] = array();
+        $files[$this->$fileType->fileName] = array();
       }
     }
     return $files;