diff --git a/hphp/test/zend/bad/ext-standard-serialize/bug42919.php b/hphp/test/zend/good/ext-standard-serialize/bug42919.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-serialize/bug42919.php
rename to hphp/test/zend/good/ext-standard-serialize/bug42919.php
diff --git a/hphp/test/zend/bad/ext-standard-serialize/bug42919.php.expectf b/hphp/test/zend/good/ext-standard-serialize/bug42919.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-serialize/bug42919.php.expectf
rename to hphp/test/zend/good/ext-standard-serialize/bug42919.php.expectf
diff --git a/hphp/test/zend/bad/zend/037.php b/hphp/test/zend/good/zend/037.php
similarity index 100%
rename from hphp/test/zend/bad/zend/037.php
rename to hphp/test/zend/good/zend/037.php
diff --git a/hphp/test/zend/bad/zend/037.php.expectf b/hphp/test/zend/good/zend/037.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/037.php.expectf
rename to hphp/test/zend/good/zend/037.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug43344_1.php b/hphp/test/zend/good/zend/bug43344_1.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_1.php
rename to hphp/test/zend/good/zend/bug43344_1.php
diff --git a/hphp/test/zend/bad/zend/bug43344_1.php.expectf b/hphp/test/zend/good/zend/bug43344_1.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_1.php.expectf
rename to hphp/test/zend/good/zend/bug43344_1.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug43344_10.php b/hphp/test/zend/good/zend/bug43344_10.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_10.php
rename to hphp/test/zend/good/zend/bug43344_10.php
diff --git a/hphp/test/zend/bad/zend/bug43344_10.php.expectf b/hphp/test/zend/good/zend/bug43344_10.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_10.php.expectf
rename to hphp/test/zend/good/zend/bug43344_10.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug43344_11.php b/hphp/test/zend/good/zend/bug43344_11.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_11.php
rename to hphp/test/zend/good/zend/bug43344_11.php
diff --git a/hphp/test/zend/bad/zend/bug43344_11.php.expectf b/hphp/test/zend/good/zend/bug43344_11.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_11.php.expectf
rename to hphp/test/zend/good/zend/bug43344_11.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug43344_12.php b/hphp/test/zend/good/zend/bug43344_12.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_12.php
rename to hphp/test/zend/good/zend/bug43344_12.php
diff --git a/hphp/test/zend/bad/zend/bug43344_12.php.expectf b/hphp/test/zend/good/zend/bug43344_12.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_12.php.expectf
rename to hphp/test/zend/good/zend/bug43344_12.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug43344_13.php b/hphp/test/zend/good/zend/bug43344_13.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_13.php
rename to hphp/test/zend/good/zend/bug43344_13.php
diff --git a/hphp/test/zend/bad/zend/bug43344_13.php.expectf b/hphp/test/zend/good/zend/bug43344_13.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_13.php.expectf
rename to hphp/test/zend/good/zend/bug43344_13.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug43344_6.php b/hphp/test/zend/good/zend/bug43344_6.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_6.php
rename to hphp/test/zend/good/zend/bug43344_6.php
diff --git a/hphp/test/zend/bad/zend/bug43344_6.php.expectf b/hphp/test/zend/good/zend/bug43344_6.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43344_6.php.expectf
rename to hphp/test/zend/good/zend/bug43344_6.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug44653.php b/hphp/test/zend/good/zend/bug44653.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug44653.php
rename to hphp/test/zend/good/zend/bug44653.php
diff --git a/hphp/test/zend/bad/zend/bug44653.php.expectf b/hphp/test/zend/good/zend/bug44653.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug44653.php.expectf
rename to hphp/test/zend/good/zend/bug44653.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug46813.php b/hphp/test/zend/good/zend/bug46813.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug46813.php
rename to hphp/test/zend/good/zend/bug46813.php
diff --git a/hphp/test/zend/bad/zend/bug46813.php.expectf b/hphp/test/zend/good/zend/bug46813.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug46813.php.expectf
rename to hphp/test/zend/good/zend/bug46813.php.expectf
diff --git a/hphp/test/zend/bad/zend/constants_006.php b/hphp/test/zend/good/zend/constants_006.php
similarity index 100%
rename from hphp/test/zend/bad/zend/constants_006.php
rename to hphp/test/zend/good/zend/constants_006.php
diff --git a/hphp/test/zend/bad/zend/constants_006.php.expectf b/hphp/test/zend/good/zend/constants_006.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/constants_006.php.expectf
rename to hphp/test/zend/good/zend/constants_006.php.expectf
diff --git a/hphp/test/zend/bad/zend/inter_02.php b/hphp/test/zend/good/zend/inter_02.php
similarity index 100%
rename from hphp/test/zend/bad/zend/inter_02.php
rename to hphp/test/zend/good/zend/inter_02.php
diff --git a/hphp/test/zend/bad/zend/inter_02.php.expectf b/hphp/test/zend/good/zend/inter_02.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/inter_02.php.expectf
rename to hphp/test/zend/good/zend/inter_02.php.expectf
diff --git a/hphp/test/zend/bad/zend/interface_exists_002.php b/hphp/test/zend/good/zend/interface_exists_002.php
similarity index 100%
rename from hphp/test/zend/bad/zend/interface_exists_002.php
rename to hphp/test/zend/good/zend/interface_exists_002.php
diff --git a/hphp/test/zend/bad/zend/interface_exists_002.php.expectf b/hphp/test/zend/good/zend/interface_exists_002.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/interface_exists_002.php.expectf
rename to hphp/test/zend/good/zend/interface_exists_002.php.expectf
diff --git a/hphp/test/zend/bad/zend/ns_071.php b/hphp/test/zend/good/zend/ns_071.php
similarity index 100%
rename from hphp/test/zend/bad/zend/ns_071.php
rename to hphp/test/zend/good/zend/ns_071.php
diff --git a/hphp/test/zend/bad/zend/ns_071.php.expectf b/hphp/test/zend/good/zend/ns_071.php.expectf
similarity index 96%
rename from hphp/test/zend/bad/zend/ns_071.php.expectf
rename to hphp/test/zend/good/zend/ns_071.php.expectf
index 420b54dd9..34b94af4c 100644
--- a/hphp/test/zend/bad/zend/ns_071.php.expectf
+++ b/hphp/test/zend/good/zend/ns_071.php.expectf
@@ -1,3 +1,2 @@
 NULL
-
 HipHop Fatal error: %a
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/ns_072.php b/hphp/test/zend/good/zend/ns_072.php
similarity index 100%
rename from hphp/test/zend/bad/zend/ns_072.php
rename to hphp/test/zend/good/zend/ns_072.php
diff --git a/hphp/test/zend/bad/zend/ns_072.php.expectf b/hphp/test/zend/good/zend/ns_072.php.expectf
similarity index 98%
rename from hphp/test/zend/bad/zend/ns_072.php.expectf
rename to hphp/test/zend/good/zend/ns_072.php.expectf
index 8c4b97a10..11f54fafa 100644
--- a/hphp/test/zend/bad/zend/ns_072.php.expectf
+++ b/hphp/test/zend/good/zend/ns_072.php.expectf
@@ -1,5 +1,4 @@
 object(foo\test)#%d (0) {
 }
 NULL
-
 HipHop Fatal error: %a
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/trait_exists_002.php b/hphp/test/zend/good/zend/trait_exists_002.php
similarity index 100%
rename from hphp/test/zend/bad/zend/trait_exists_002.php
rename to hphp/test/zend/good/zend/trait_exists_002.php
diff --git a/hphp/test/zend/bad/zend/trait_exists_002.php.expectf b/hphp/test/zend/good/zend/trait_exists_002.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/trait_exists_002.php.expectf
rename to hphp/test/zend/good/zend/trait_exists_002.php.expectf
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 07ad9451e..7c797799b 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -396,6 +396,7 @@ def walk(filename, source):
 
             # PHP puts a newline in that we don't
             exp = exp.replace('\n\nFatal error:', '\nFatal error:')
+            exp = exp.replace('\n\nCatchable fatal error:', '\nCatchable fatal error:')
             exp = exp.replace('\n\nWarning:', '\nWarning:')
             exp = exp.replace('\n\nNotice:', '\nNotice:')