diff --git a/hphp/test/zend/good/ext-date/DateTimeZone_listAbbreviations_basic1.php b/hphp/test/zend/bad/ext-date/DateTimeZone_listAbbreviations_basic1.php
similarity index 100%
rename from hphp/test/zend/good/ext-date/DateTimeZone_listAbbreviations_basic1.php
rename to hphp/test/zend/bad/ext-date/DateTimeZone_listAbbreviations_basic1.php
diff --git a/hphp/test/zend/good/ext-date/DateTimeZone_listAbbreviations_basic1.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_listAbbreviations_basic1.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-date/DateTimeZone_listAbbreviations_basic1.php.expectf
rename to hphp/test/zend/bad/ext-date/DateTimeZone_listAbbreviations_basic1.php.expectf
diff --git a/hphp/test/zend/good/ext-date/bug52290.php b/hphp/test/zend/bad/ext-date/bug52290.php
similarity index 100%
rename from hphp/test/zend/good/ext-date/bug52290.php
rename to hphp/test/zend/bad/ext-date/bug52290.php
diff --git a/hphp/test/zend/good/ext-date/bug52290.php.expectf b/hphp/test/zend/bad/ext-date/bug52290.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-date/bug52290.php.expectf
rename to hphp/test/zend/bad/ext-date/bug52290.php.expectf
diff --git a/hphp/test/zend/good/ext-date/timezone_abbreviations_list_basic1.php b/hphp/test/zend/bad/ext-date/timezone_abbreviations_list_basic1.php
similarity index 100%
rename from hphp/test/zend/good/ext-date/timezone_abbreviations_list_basic1.php
rename to hphp/test/zend/bad/ext-date/timezone_abbreviations_list_basic1.php
diff --git a/hphp/test/zend/good/ext-date/timezone_abbreviations_list_basic1.php.expectf b/hphp/test/zend/bad/ext-date/timezone_abbreviations_list_basic1.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-date/timezone_abbreviations_list_basic1.php.expectf
rename to hphp/test/zend/bad/ext-date/timezone_abbreviations_list_basic1.php.expectf
diff --git a/hphp/test/zend/good/ext-gd/bug24155.php b/hphp/test/zend/bad/ext-gd/bug24155.php
similarity index 100%
rename from hphp/test/zend/good/ext-gd/bug24155.php
rename to hphp/test/zend/bad/ext-gd/bug24155.php
diff --git a/hphp/test/zend/good/ext-gd/bug24155.php.expectf b/hphp/test/zend/bad/ext-gd/bug24155.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-gd/bug24155.php.expectf
rename to hphp/test/zend/bad/ext-gd/bug24155.php.expectf
diff --git a/hphp/test/zend/good/ext-gd/bug39366.php b/hphp/test/zend/bad/ext-gd/bug39366.php
similarity index 100%
rename from hphp/test/zend/good/ext-gd/bug39366.php
rename to hphp/test/zend/bad/ext-gd/bug39366.php
diff --git a/hphp/test/zend/good/ext-gd/bug39366.php.expectf b/hphp/test/zend/bad/ext-gd/bug39366.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-gd/bug39366.php.expectf
rename to hphp/test/zend/bad/ext-gd/bug39366.php.expectf
diff --git a/hphp/test/zend/good/ext-gd/bug48732.php b/hphp/test/zend/bad/ext-gd/bug48732.php
similarity index 100%
rename from hphp/test/zend/good/ext-gd/bug48732.php
rename to hphp/test/zend/bad/ext-gd/bug48732.php
diff --git a/hphp/test/zend/good/ext-gd/bug48732.php.expectf b/hphp/test/zend/bad/ext-gd/bug48732.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-gd/bug48732.php.expectf
rename to hphp/test/zend/bad/ext-gd/bug48732.php.expectf
diff --git a/hphp/test/zend/good/ext-mbstring/bug54494.php b/hphp/test/zend/bad/ext-mbstring/bug54494.php
similarity index 100%
rename from hphp/test/zend/good/ext-mbstring/bug54494.php
rename to hphp/test/zend/bad/ext-mbstring/bug54494.php
diff --git a/hphp/test/zend/good/ext-mbstring/bug54494.php.expectf b/hphp/test/zend/bad/ext-mbstring/bug54494.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-mbstring/bug54494.php.expectf
rename to hphp/test/zend/bad/ext-mbstring/bug54494.php.expectf
diff --git a/hphp/test/zend/good/ext-openssl/openssl_x509_parse_basic.php b/hphp/test/zend/bad/ext-openssl/openssl_x509_parse_basic.php
similarity index 100%
rename from hphp/test/zend/good/ext-openssl/openssl_x509_parse_basic.php
rename to hphp/test/zend/bad/ext-openssl/openssl_x509_parse_basic.php
diff --git a/hphp/test/zend/good/ext-openssl/openssl_x509_parse_basic.php.expectf b/hphp/test/zend/bad/ext-openssl/openssl_x509_parse_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-openssl/openssl_x509_parse_basic.php.expectf
rename to hphp/test/zend/bad/ext-openssl/openssl_x509_parse_basic.php.expectf
diff --git a/hphp/test/zend/good/ext-standard-streams/bug61115-2.php b/hphp/test/zend/bad/ext-standard-streams/bug61115-2.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-streams/bug61115-2.php
rename to hphp/test/zend/bad/ext-standard-streams/bug61115-2.php
diff --git a/hphp/test/zend/good/ext-standard-streams/bug61115-2.php.expectf b/hphp/test/zend/bad/ext-standard-streams/bug61115-2.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-standard-streams/bug61115-2.php.expectf
rename to hphp/test/zend/bad/ext-standard-streams/bug61115-2.php.expectf
diff --git a/hphp/test/zend/good/ext-standard-strings/moneyformat.php b/hphp/test/zend/bad/ext-standard-strings/moneyformat.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-strings/moneyformat.php
rename to hphp/test/zend/bad/ext-standard-strings/moneyformat.php
diff --git a/hphp/test/zend/good/ext-standard-strings/moneyformat.php.expectf b/hphp/test/zend/bad/ext-standard-strings/moneyformat.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-standard-strings/moneyformat.php.expectf
rename to hphp/test/zend/bad/ext-standard-strings/moneyformat.php.expectf
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 16d3489ce..46f1c03a9 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -198,6 +198,18 @@ bad_tests = (
 
     # time tests are hard to write, these are poorly written
     '/ext-date/bug48187.php',
+
+    # broken on unbuntu 12.04
+    '/ext-date/DateTimeZone_listAbbreviations_basic1.php',
+    '/ext-date/bug52290.php',
+    '/ext-date/timezone_abbreviations_list_basic1.php',
+    '/ext-gd/bug24155.php',
+    '/ext-gd/bug39366.php',
+    '/ext-gd/bug48732.php',
+    '/ext-mbstring/bug54494.php',
+    '/ext-openssl/openssl_x509_parse_basic.php',
+    '/ext-standard-streams/bug61115-2.php',
+    '/ext-standard-strings/moneyformat.php',
 )
 
 # Random other files that zend wants