diff --git a/hphp/test/run b/hphp/test/run
index 730636cbe..41e1f9820 100755
--- a/hphp/test/run
+++ b/hphp/test/run
@@ -58,14 +58,13 @@ function error($message) {
 
 function hphp_home() {
   static $ret;
-  if (!$ret) {
-    $top_level = system('git rev-parse --show-toplevel', $status);
-    if ($status === 0) {
-      return $ret = rtrim($top_level, '/');
-    }
-    error("Couldn't determine the root of your fbcode repository.\n");
+  if ($ret) { return $ret; }
+
+  $top_level = system('git rev-parse --show-toplevel', $status);
+  if ($status === 0) {
+    return $ret = rtrim($top_level, '/');
   }
-  return $ret;
+  error("Couldn't determine the root of your fbcode repository.\n");
 }
 
 function idx($array, $key, $default = null) {
diff --git a/hphp/test/slow/directory/1702.php b/hphp/test/slow/directory/1702.php
index 6f5980674..e9161b872 100644
--- a/hphp/test/slow/directory/1702.php
+++ b/hphp/test/slow/directory/1702.php
@@ -1,7 +1,5 @@
 <?php
 
-include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
-
 $d = dir(__DIR__."/../../sample_dir/");
 echo "Path: " . $d->path . "\n";
 $files = array(); // order changes per machine
diff --git a/hphp/test/slow/ext_iterator/1798.php b/hphp/test/slow/ext_iterator/1798.php
index 5d9f02f53..c224a8533 100644
--- a/hphp/test/slow/ext_iterator/1798.php
+++ b/hphp/test/slow/ext_iterator/1798.php
@@ -1,7 +1,5 @@
 <?php
 
-include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
-
 $sample_dir = __DIR__.'/../../sample_dir';
 
 $files = array();
diff --git a/hphp/test/slow/ext_iterator/1799.php b/hphp/test/slow/ext_iterator/1799.php
index f5aec4ebc..ba0985e47 100644
--- a/hphp/test/slow/ext_iterator/1799.php
+++ b/hphp/test/slow/ext_iterator/1799.php
@@ -1,7 +1,5 @@
 <?php
 
-include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
-
 $dir = new DirectoryIterator(__DIR__.'/../../sample_dir');
 $files = array(); // order changes per machine
 while($dir->valid()) {
diff --git a/hphp/test/slow/ext_iterator/1800.php b/hphp/test/slow/ext_iterator/1800.php
index 93cdfa8a0..431eaba63 100644
--- a/hphp/test/slow/ext_iterator/1800.php
+++ b/hphp/test/slow/ext_iterator/1800.php
@@ -1,7 +1,5 @@
 <?php
 
-include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
-
 $ite=new RecursiveDirectoryIterator(__DIR__.'/../../sample_dir/');
 $bytestotal=0;
 $nbfiles=0;
@@ -15,5 +13,4 @@ foreach ($ite as $filename=>$cur) {
 }
 asort($files);
 var_dump(array_values($files));
-$bytestotal=number_format($bytestotal);
 echo "Total: $nbfiles files, $bytestotal bytes\n";
diff --git a/hphp/test/slow/ext_iterator/1800.php.expectf b/hphp/test/slow/ext_iterator/1800.php.expectf
index 4d353517d..c28599114 100644
--- a/hphp/test/slow/ext_iterator/1800.php.expectf
+++ b/hphp/test/slow/ext_iterator/1800.php.expectf
@@ -1,6 +1,6 @@
 array(5) {
   [0]=>
-  string(%d) "%s../../sample_dir/dir => 18
+  string(%d) "%s../../sample_dir/dir => %d
 "
   [1]=>
   string(%d) "%s../../sample_dir/empty => 0
@@ -15,4 +15,4 @@ array(5) {
   string(%d) "%s../../sample_dir/symlink => 3
 "
 }
-Total: 5 files, 483 bytes
+Total: 5 files, %d bytes
diff --git a/hphp/test/slow/ext_iterator/1801.php b/hphp/test/slow/ext_iterator/1801.php
index 4df00c5c1..45f99c55e 100644
--- a/hphp/test/slow/ext_iterator/1801.php
+++ b/hphp/test/slow/ext_iterator/1801.php
@@ -1,7 +1,5 @@
 <?php
 
-include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
-
 $ite=new RecursiveDirectoryIterator(__DIR__.'/../../sample_dir/');
 $bytestotal=0;
 $nbfiles=0;
diff --git a/hphp/test/slow/ext_iterator/1802.php b/hphp/test/slow/ext_iterator/1802.php
index b6c8459e0..f5c812961 100644
--- a/hphp/test/slow/ext_iterator/1802.php
+++ b/hphp/test/slow/ext_iterator/1802.php
@@ -1,7 +1,5 @@
 <?php
 
-include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
-
 $path = __DIR__."/../../sample_dir/";
 $files = array(); // order changes per machine
 foreach (new RecursiveIteratorIterator(
diff --git a/hphp/test/slow/ext_iterator/1803.php b/hphp/test/slow/ext_iterator/1803.php
index 18d7b47fd..7a8937549 100644
--- a/hphp/test/slow/ext_iterator/1803.php
+++ b/hphp/test/slow/ext_iterator/1803.php
@@ -1,7 +1,5 @@
 <?php
 
-include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
-
 $directory = __DIR__."/../../sample_dir";
 $fileSPLObjects = new RecursiveIteratorIterator(
   new RecursiveDirectoryIterator($directory),
diff --git a/hphp/test/slow/ext_iterator/1804.php b/hphp/test/slow/ext_iterator/1804.php
index 6cbfb48ba..4492aa67c 100644
--- a/hphp/test/slow/ext_iterator/1804.php
+++ b/hphp/test/slow/ext_iterator/1804.php
@@ -1,7 +1,5 @@
 <?php
 
-include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
-
 function getFiles(&$rdi,$depth=0) {
   if (!is_object($rdi)) return;
   $files = array(); // order changes per machine
diff --git a/hphp/test/slow/ext_soap/1809.php b/hphp/test/slow/ext_soap/1809.php
index 5ead59f64..4e61f44bb 100644
--- a/hphp/test/slow/ext_soap/1809.php
+++ b/hphp/test/slow/ext_soap/1809.php
@@ -9,7 +9,7 @@
  }
 
  function test($options) {
-   return new MySoap(__DIR__.'/../../test.wsdl', $options);
+   return new MySoap(__DIR__.'/1809.wsdl', $options);
  }
 
  var_dump(test(array('foo' => 'bar'))->pub);
diff --git a/hphp/test/test.wsdl b/hphp/test/slow/ext_soap/1809.wsdl
similarity index 100%
rename from hphp/test/test.wsdl
rename to hphp/test/slow/ext_soap/1809.wsdl
diff --git a/hphp/test/test_code_run.cpp b/hphp/test/test_code_run.cpp
index b0d23b7f4..40e581f3e 100644
--- a/hphp/test/test_code_run.cpp
+++ b/hphp/test/test_code_run.cpp
@@ -23147,7 +23147,7 @@ bool TestCodeRun::TestExtSoap() {
        "  }"
        "}"
        "function test($options) {"
-       "  return new MySoap('test/test.wsdl', $options);"
+       "  return new MySoap('test/slow/ext_soap/1809.wsdl', $options);"
        "}"
        "var_dump(test(array('foo' => 'bar'))->pub);");
 
diff --git a/hphp/test/test_ext_soap.cpp b/hphp/test/test_ext_soap.cpp
index 511d54baf..8230f1534 100644
--- a/hphp/test/test_ext_soap.cpp
+++ b/hphp/test/test_ext_soap.cpp
@@ -129,7 +129,7 @@ bool TestExtSoap::test_SoapServerArrayParam() {
 
 bool TestExtSoap::test_SoapServerWSDL() {
   m_server = p_SoapServer(NEWOBJ(c_SoapServer)());
-  m_server->t___construct("test/test.wsdl",
+  m_server->t___construct("test/slow/ext_soap/1809.wsdl",
                           CREATE_MAP1("uri", "http://testuri.org"));
   m_server->t_addfunction("Add");