diff --git a/hphp/test/quick/debugger/break2.php b/hphp/test/quick/debugger/break2.php.disabled
similarity index 100%
rename from hphp/test/quick/debugger/break2.php
rename to hphp/test/quick/debugger/break2.php.disabled
diff --git a/hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_basic.php b/hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_basic.php
similarity index 100%
rename from hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_basic.php
rename to hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_basic.php
diff --git a/hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_delimiter_basic.php b/hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_delimiter_basic.php
similarity index 100%
rename from hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_delimiter_basic.php
rename to hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_delimiter_basic.php
diff --git a/hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_delimiter_error.php b/hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_delimiter_error.php
similarity index 100%
rename from hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_delimiter_error.php
rename to hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_delimiter_error.php
diff --git a/hphp/test/zend/good/ext-standard-array/array_next_error2.php b/hphp/test/zend/bad/ext-standard-array/array_next_error2.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-array/array_next_error2.php
rename to hphp/test/zend/bad/ext-standard-array/array_next_error2.php
diff --git a/hphp/test/zend/good/ext-standard-array/prev_error3.php b/hphp/test/zend/bad/ext-standard-array/prev_error3.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-array/prev_error3.php
rename to hphp/test/zend/bad/ext-standard-array/prev_error3.php
diff --git a/hphp/test/zend/good/ext-standard-class_object/get_object_vars_variation_003.php b/hphp/test/zend/bad/ext-standard-class_object/get_object_vars_variation_003.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-class_object/get_object_vars_variation_003.php
rename to hphp/test/zend/bad/ext-standard-class_object/get_object_vars_variation_003.php
diff --git a/hphp/test/zend/good/ext-standard-file/bug12556.php b/hphp/test/zend/bad/ext-standard-file/bug12556.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/bug12556.php
rename to hphp/test/zend/bad/ext-standard-file/bug12556.php
diff --git a/hphp/test/zend/good/ext-standard-file/bug22382.php b/hphp/test/zend/bad/ext-standard-file/bug22382.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/bug22382.php
rename to hphp/test/zend/bad/ext-standard-file/bug22382.php
diff --git a/hphp/test/zend/good/ext-standard-file/bug26003.php b/hphp/test/zend/bad/ext-standard-file/bug26003.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/bug26003.php
rename to hphp/test/zend/bad/ext-standard-file/bug26003.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation10.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation10.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation10.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation10.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation13.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation13.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation13.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation13.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation14.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation14.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation14.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation14.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation15.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation15.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation15.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation15.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation16.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation16.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation16.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation16.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation18.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation18.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation18.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation18.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation20.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation20.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation20.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation20.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation21.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation21.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation21.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation21.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation22.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation22.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation22.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation22.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation23.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation23.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation23.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation23.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation26.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation26.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation26.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation26.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation29.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation29.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation29.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation29.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation30.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation30.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation30.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation30.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation31.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation31.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation31.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation31.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation8.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation8.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation8.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation8.php
diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation9.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation9.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fgetcsv_variation9.php
rename to hphp/test/zend/bad/ext-standard-file/fgetcsv_variation9.php
diff --git a/hphp/test/zend/good/ext-standard-file/fputcsv_variation10.php b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation10.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fputcsv_variation10.php
rename to hphp/test/zend/bad/ext-standard-file/fputcsv_variation10.php
diff --git a/hphp/test/zend/good/ext-standard-file/fputcsv_variation11.php b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation11.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fputcsv_variation11.php
rename to hphp/test/zend/bad/ext-standard-file/fputcsv_variation11.php
diff --git a/hphp/test/zend/good/ext-standard-file/fputcsv_variation12.php b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation12.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fputcsv_variation12.php
rename to hphp/test/zend/bad/ext-standard-file/fputcsv_variation12.php
diff --git a/hphp/test/zend/good/ext-standard-file/fputcsv_variation5.php b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation5.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-file/fputcsv_variation5.php
rename to hphp/test/zend/bad/ext-standard-file/fputcsv_variation5.php
diff --git a/hphp/test/zend/good/ext-standard-general_functions/004.php b/hphp/test/zend/bad/ext-standard-general_functions/004.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-general_functions/004.php
rename to hphp/test/zend/bad/ext-standard-general_functions/004.php
diff --git a/hphp/test/zend/good/ext-standard-strings/bug28386.php b/hphp/test/zend/bad/ext-standard-strings/bug28386.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-strings/bug28386.php
rename to hphp/test/zend/bad/ext-standard-strings/bug28386.php
diff --git a/hphp/test/zend/good/ext-standard-strings/wordwrap_basic.php b/hphp/test/zend/bad/ext-standard-strings/wordwrap_basic.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-strings/wordwrap_basic.php
rename to hphp/test/zend/bad/ext-standard-strings/wordwrap_basic.php
diff --git a/hphp/test/zend/good/ext-standard-strings/wordwrap_variation5.php b/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation5.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-strings/wordwrap_variation5.php
rename to hphp/test/zend/bad/ext-standard-strings/wordwrap_variation5.php
diff --git a/hphp/test/zend/good/tests-lang/038.php b/hphp/test/zend/bad/tests-lang/038.php
similarity index 100%
rename from hphp/test/zend/good/tests-lang/038.php
rename to hphp/test/zend/bad/tests-lang/038.php
diff --git a/hphp/test/zend/good/zend/bug48912.php b/hphp/test/zend/bad/zend/bug48912.php
similarity index 100%
rename from hphp/test/zend/good/zend/bug48912.php
rename to hphp/test/zend/bad/zend/bug48912.php
diff --git a/hphp/test/zend/good/zend/bug64239_3.php b/hphp/test/zend/bad/zend/bug64239_3.php
similarity index 100%
rename from hphp/test/zend/good/zend/bug64239_3.php
rename to hphp/test/zend/bad/zend/bug64239_3.php
diff --git a/hphp/test/zend/good/zend/class_alias_015.php b/hphp/test/zend/bad/zend/class_alias_015.php
similarity index 100%
rename from hphp/test/zend/good/zend/class_alias_015.php
rename to hphp/test/zend/bad/zend/class_alias_015.php
diff --git a/hphp/test/zend/good/zend/lsb_021.php b/hphp/test/zend/bad/zend/lsb_021.php
similarity index 100%
rename from hphp/test/zend/good/zend/lsb_021.php
rename to hphp/test/zend/bad/zend/lsb_021.php
diff --git a/hphp/test/zend/good/zend/lsb_022.php b/hphp/test/zend/bad/zend/lsb_022.php
similarity index 100%
rename from hphp/test/zend/good/zend/lsb_022.php
rename to hphp/test/zend/bad/zend/lsb_022.php