diff --git a/hphp/test/zend/bad/zend/bug62680.php b/hphp/test/zend/good/zend/bug62680.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug62680.php
rename to hphp/test/zend/good/zend/bug62680.php
diff --git a/hphp/test/zend/bad/zend/bug62680.php.expectf b/hphp/test/zend/good/zend/bug62680.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug62680.php.expectf
rename to hphp/test/zend/good/zend/bug62680.php.expectf
diff --git a/hphp/test/zend/bad/zend/closure_033.php b/hphp/test/zend/good/zend/closure_033.php
similarity index 100%
rename from hphp/test/zend/bad/zend/closure_033.php
rename to hphp/test/zend/good/zend/closure_033.php
diff --git a/hphp/test/zend/bad/zend/closure_033.php.expectf b/hphp/test/zend/good/zend/closure_033.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/closure_033.php.expectf
rename to hphp/test/zend/good/zend/closure_033.php.expectf
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
old mode 100644
new mode 100755
index 0d6623678..5d461a71c
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -57,6 +57,10 @@ bad_tests = (
 
     # line number is inconsistent on stack overflow
     'bug41633_3.php',
+
+    # broken in Jenkins
+    'bug35239.php',
+    'bug54265.php',
 )
 
 errors = (
@@ -302,7 +306,7 @@ print "Running all tests from zend/all"
 stdout = subprocess.Popen(
     [
         'tools/verify_to_json.php',
-        '../test/run',
+        'test/run',
         'test/zend/all',
         'interp',
         '0',