diff --git a/hphp/test/zend/good/bug60771.php b/hphp/test/zend/good/bug60771.php
index 57a18197e..ed3946f52 100644
--- a/hphp/test/zend/good/bug60771.php
+++ b/hphp/test/zend/good/bug60771.php
@@ -1,4 +1,5 @@
 <?php
  file_put_contents('test.php',str_repeat('passed, ',1024));
  require('test.php');
+unlink('test.php');
 ?>
\ No newline at end of file
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 2569af61d..c50841ef3 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -52,8 +52,10 @@ def walk(filename):
 
     test_files.append(full_dest_filename)
 
-    if '%s' in exp:
-        exp = exp.replace('in %s on', 'in %s/%s on' % ('hphp/test/zend/bad', dest_filename))
+    if 'bug60771.php' in full_dest_filename:
+        test = test.replace("?>", "unlink('test.php');\n?>")
+
+    exp = exp.replace('in %s on', 'in %s/%s on' % ('hphp/test/zend/bad', dest_filename))
 
     # PHP puts a newline in that we don't
     exp = exp.replace('\n\nFatal error:', '\nFatal error:')