diff --git a/hphp/test/zend/good/ext-standard-file/mkdir-001.php b/hphp/test/zend/good/ext-standard-file/mkdir-001.php
index 567ad33c4..160a0d0bb 100644
--- a/hphp/test/zend/good/ext-standard-file/mkdir-001.php
+++ b/hphp/test/zend/good/ext-standard-file/mkdir-001.php
@@ -1,19 +1,19 @@
 <?php
 
-var_dump(mkdir("testdir"));
-var_dump(mkdir("testdir/subdir"));
-var_dump(rmdir("testdir/subdir"));
-var_dump(rmdir("testdir"));
+var_dump(mkdir("mkdir-001"));
+var_dump(mkdir("mkdir-001/subdir"));
+var_dump(rmdir("mkdir-001/subdir"));
+var_dump(rmdir("mkdir-001"));
 
-var_dump(mkdir("./testdir"));
-var_dump(mkdir("./testdir/subdir"));
-var_dump(rmdir("./testdir/subdir"));
-var_dump(rmdir("./testdir"));
+var_dump(mkdir("./mkdir-001"));
+var_dump(mkdir("./mkdir-001/subdir"));
+var_dump(rmdir("./mkdir-001/subdir"));
+var_dump(rmdir("./mkdir-001"));
 
-var_dump(mkdir(dirname(__FILE__)."/testdir"));
-var_dump(mkdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir"));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-001"));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-001/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-001/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-001"));
 
 echo "Done\n";
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-standard-file/mkdir-002.php b/hphp/test/zend/good/ext-standard-file/mkdir-002.php
index 85e1e3efa..cc8a52b08 100644
--- a/hphp/test/zend/good/ext-standard-file/mkdir-002.php
+++ b/hphp/test/zend/good/ext-standard-file/mkdir-002.php
@@ -1,23 +1,23 @@
 <?php
 
-var_dump(mkdir("testdir", 0777));
-var_dump(mkdir("testdir/subdir", 0777));
-var_dump(`ls -l testdir`);
-var_dump(rmdir("testdir/subdir"));
-var_dump(rmdir("testdir"));
+var_dump(mkdir("mkdir-002", 0777));
+var_dump(mkdir("mkdir-002/subdir", 0777));
+var_dump(`ls -l mkdir-002`);
+var_dump(rmdir("mkdir-002/subdir"));
+var_dump(rmdir("mkdir-002"));
 
-var_dump(mkdir("./testdir", 0777));
-var_dump(mkdir("./testdir/subdir", 0777));
-var_dump(`ls -l ./testdir`);
-var_dump(rmdir("./testdir/subdir"));
-var_dump(rmdir("./testdir"));
+var_dump(mkdir("./mkdir-002", 0777));
+var_dump(mkdir("./mkdir-002/subdir", 0777));
+var_dump(`ls -l ./mkdir-002`);
+var_dump(rmdir("./mkdir-002/subdir"));
+var_dump(rmdir("./mkdir-002"));
 
-var_dump(mkdir(dirname(__FILE__)."/testdir", 0777));
-var_dump(mkdir(dirname(__FILE__)."/testdir/subdir", 0777));
-$dirname = dirname(__FILE__)."/testdir";
+var_dump(mkdir(dirname(__FILE__)."/mkdir-002", 0777));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-002/subdir", 0777));
+$dirname = dirname(__FILE__)."/mkdir-002";
 var_dump(`ls -l $dirname`);
-var_dump(rmdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-002/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-002"));
 
 echo "Done\n";
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-standard-file/mkdir-003.php b/hphp/test/zend/good/ext-standard-file/mkdir-003.php
index 6b16f670d..4fdd5b5ac 100644
--- a/hphp/test/zend/good/ext-standard-file/mkdir-003.php
+++ b/hphp/test/zend/good/ext-standard-file/mkdir-003.php
@@ -1,16 +1,16 @@
 <?php
 
-var_dump(mkdir("testdir/subdir", 0777, true));
-var_dump(rmdir("testdir/subdir"));
-var_dump(rmdir("testdir"));
+var_dump(mkdir("mkdir-003/subdir", 0777, true));
+var_dump(rmdir("mkdir-003/subdir"));
+var_dump(rmdir("mkdir-003"));
 
-var_dump(mkdir("./testdir/subdir", 0777, true));
-var_dump(rmdir("./testdir/subdir"));
-var_dump(rmdir("./testdir"));
+var_dump(mkdir("./mkdir-003/subdir", 0777, true));
+var_dump(rmdir("./mkdir-003/subdir"));
+var_dump(rmdir("./mkdir-003"));
 
-var_dump(mkdir(dirname(__FILE__)."/testdir/subdir", 0777, true));
-var_dump(rmdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir"));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-003/subdir", 0777, true));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-003/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-003"));
 
 echo "Done\n";
 ?>
\ No newline at end of file
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index cca19aa78..05e4d781d 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -516,6 +516,12 @@ def walk(filename, source):
         test = test.replace('test_file_ptfi', 'SplFileInfo_getPerms_basic.txt')
     if '/ext-spl/SplFileInfo_getInode_basic.php' in full_dest_filename:
         test = test.replace('test_file_ptfi', 'SplFileInfo_getInode_basic.txt')
+    if '/ext-standard-file/mkdir-001.php' in full_dest_filename:
+        test = test.replace('testdir', 'mkdir-001')
+    if '/ext-standard-file/mkdir-002.php' in full_dest_filename:
+        test = test.replace('testdir', 'mkdir-002')
+    if '/ext-standard-file/mkdir-003.php' in full_dest_filename:
+        test = test.replace('testdir', 'mkdir-003')
 
     file(full_dest_filename, 'w').write(test)