diff --git a/hphp/test/zend/good/ext-spl/bug42364.php.disabled b/hphp/test/zend/good/ext-spl/bug42364.php
similarity index 82%
rename from hphp/test/zend/good/ext-spl/bug42364.php.disabled
rename to hphp/test/zend/good/ext-spl/bug42364.php
index d2ef582b9..ab78e761f 100644
--- a/hphp/test/zend/good/ext-spl/bug42364.php.disabled
+++ b/hphp/test/zend/good/ext-spl/bug42364.php
@@ -1,5 +1,5 @@
 <?php
-$it = new DirectoryIterator(dirname(__FILE__));
+$it = new DirectoryIterator(__DIR__."/../../../sample_dir/");
 
 $count = 0;
 
diff --git a/hphp/test/zend/good/ext-standard-file/lchgrp_basic.php b/hphp/test/zend/good/ext-standard-file/lchgrp_basic.php
index 9ea6a6f53..8ab422d56 100644
--- a/hphp/test/zend/good/ext-standard-file/lchgrp_basic.php
+++ b/hphp/test/zend/good/ext-standard-file/lchgrp_basic.php
@@ -1,6 +1,6 @@
 <?php
 $filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchgrp.txt';
-$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'symlink.txt';
+$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchgrp_basic_symlink.txt';
 
 $gid = posix_getgid();
 
@@ -13,7 +13,7 @@ var_dump( filegroup( $symlink ) === $gid );
 ===DONE===<?php
 
 $filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchgrp.txt';
-$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'symlink.txt';
+$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchgrp_basic_symlink.txt';
 unlink($filename);
 unlink($symlink);
 
diff --git a/hphp/test/zend/good/ext-standard-file/lchown_basic.php.disabled b/hphp/test/zend/good/ext-standard-file/lchown_basic.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/lchown_basic.php.disabled
rename to hphp/test/zend/good/ext-standard-file/lchown_basic.php
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 517972cd2..1e844324a 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -519,6 +519,10 @@ def walk(filename, source):
         test = test.replace('temp.txt.gz', 'gzread_variation1.gz')
     if '/ext-zlib/gzwrite_basic.php' in full_dest_filename:
         test = test.replace('temp.txt.gz', 'gzwrite_basic.gz')
+    if '/ext-spl/bug42364.php' in full_dest_filename:
+        test = test.replace('dirname(__FILE__)', '__DIR__."/../../../sample_dir/"')
+    if '/ext-standard-file/lchgrp_basic.php' in full_dest_filename:
+        test = test.replace('symlink.txt', 'lchgrp_basic_symlink.txt')
 
     file(full_dest_filename, 'w').write(test)