diff --git a/Zend/tests/bug66811.phpt b/Zend/tests/class_name/bug66811.phpt
similarity index 100%
rename from Zend/tests/bug66811.phpt
rename to Zend/tests/class_name/bug66811.phpt
diff --git a/Zend/tests/bug69754.phpt b/Zend/tests/class_name/bug69754.phpt
similarity index 100%
rename from Zend/tests/bug69754.phpt
rename to Zend/tests/class_name/bug69754.phpt
diff --git a/Zend/tests/bug77530.phpt b/Zend/tests/class_name/bug77530.phpt
similarity index 100%
rename from Zend/tests/bug77530.phpt
rename to Zend/tests/class_name/bug77530.phpt
diff --git a/Zend/tests/fake_closure_in_internal_func_leaks.phpt b/Zend/tests/closures/fake_closure_in_internal_func_leaks.phpt
similarity index 100%
rename from Zend/tests/fake_closure_in_internal_func_leaks.phpt
rename to Zend/tests/closures/fake_closure_in_internal_func_leaks.phpt
diff --git a/Zend/tests/gh10709.phpt b/Zend/tests/constants/gh10709.phpt
similarity index 100%
rename from Zend/tests/gh10709.phpt
rename to Zend/tests/constants/gh10709.phpt
diff --git a/Zend/tests/gh10709_2.phpt b/Zend/tests/constants/gh10709_2.phpt
similarity index 100%
rename from Zend/tests/gh10709_2.phpt
rename to Zend/tests/constants/gh10709_2.phpt
diff --git a/Zend/tests/gh10709_3.phpt b/Zend/tests/constants/gh10709_3.phpt
similarity index 100%
rename from Zend/tests/gh10709_3.phpt
rename to Zend/tests/constants/gh10709_3.phpt
diff --git a/Zend/tests/constants/bug48930.phpt b/Zend/tests/constants/halt_compiler/bug48930.phpt
similarity index 100%
rename from Zend/tests/constants/bug48930.phpt
rename to Zend/tests/constants/halt_compiler/bug48930.phpt
diff --git a/Zend/tests/constants/bug53305.phpt b/Zend/tests/constants/halt_compiler/bug53305.phpt
similarity index 100%
rename from Zend/tests/constants/bug53305.phpt
rename to Zend/tests/constants/halt_compiler/bug53305.phpt
diff --git a/Zend/tests/bug54804.inc b/Zend/tests/constants/halt_compiler/bug54804.inc
similarity index 100%
rename from Zend/tests/bug54804.inc
rename to Zend/tests/constants/halt_compiler/bug54804.inc
diff --git a/Zend/tests/bug54804.phpt b/Zend/tests/constants/halt_compiler/bug54804.phpt
similarity index 100%
rename from Zend/tests/bug54804.phpt
rename to Zend/tests/constants/halt_compiler/bug54804.phpt
diff --git a/Zend/tests/constants/bug70164.phpt b/Zend/tests/constants/halt_compiler/bug70164.phpt
similarity index 100%
rename from Zend/tests/constants/bug70164.phpt
rename to Zend/tests/constants/halt_compiler/bug70164.phpt
diff --git a/Zend/tests/bug77738.phpt b/Zend/tests/constants/halt_compiler/bug77738.phpt
similarity index 100%
rename from Zend/tests/bug77738.phpt
rename to Zend/tests/constants/halt_compiler/bug77738.phpt
diff --git a/Zend/tests/halt01.phpt b/Zend/tests/constants/halt_compiler/halt01.phpt
similarity index 100%
rename from Zend/tests/halt01.phpt
rename to Zend/tests/constants/halt_compiler/halt01.phpt
diff --git a/Zend/tests/halt02.phpt b/Zend/tests/constants/halt_compiler/halt02.phpt
similarity index 100%
rename from Zend/tests/halt02.phpt
rename to Zend/tests/constants/halt_compiler/halt02.phpt
diff --git a/Zend/tests/halt03.phpt b/Zend/tests/constants/halt_compiler/halt03.phpt
similarity index 100%
rename from Zend/tests/halt03.phpt
rename to Zend/tests/constants/halt_compiler/halt03.phpt
diff --git a/Zend/tests/halt_compiler1.phpt b/Zend/tests/constants/halt_compiler/halt_compiler1.phpt
similarity index 100%
rename from Zend/tests/halt_compiler1.phpt
rename to Zend/tests/constants/halt_compiler/halt_compiler1.phpt
diff --git a/Zend/tests/halt_compiler2.phpt b/Zend/tests/constants/halt_compiler/halt_compiler2.phpt
similarity index 100%
rename from Zend/tests/halt_compiler2.phpt
rename to Zend/tests/constants/halt_compiler/halt_compiler2.phpt
diff --git a/Zend/tests/halt_compiler3.phpt b/Zend/tests/constants/halt_compiler/halt_compiler3.phpt
similarity index 100%
rename from Zend/tests/halt_compiler3.phpt
rename to Zend/tests/constants/halt_compiler/halt_compiler3.phpt
diff --git a/Zend/tests/halt_compiler4.phpt b/Zend/tests/constants/halt_compiler/halt_compiler4.phpt
similarity index 100%
rename from Zend/tests/halt_compiler4.phpt
rename to Zend/tests/constants/halt_compiler/halt_compiler4.phpt
diff --git a/Zend/tests/halt_compiler5.phpt b/Zend/tests/constants/halt_compiler/halt_compiler5.phpt
similarity index 100%
rename from Zend/tests/halt_compiler5.phpt
rename to Zend/tests/constants/halt_compiler/halt_compiler5.phpt
diff --git a/Zend/tests/bug43027.phpt b/Zend/tests/declare/bug43027.phpt
similarity index 100%
rename from Zend/tests/bug43027.phpt
rename to Zend/tests/declare/bug43027.phpt
diff --git a/Zend/tests/bug69092.2.phpt b/Zend/tests/declare/bug69092.2.phpt
similarity index 100%
rename from Zend/tests/bug69092.2.phpt
rename to Zend/tests/declare/bug69092.2.phpt
diff --git a/Zend/tests/bug69092.phpt b/Zend/tests/declare/bug69092.phpt
similarity index 100%
rename from Zend/tests/bug69092.phpt
rename to Zend/tests/declare/bug69092.phpt
diff --git a/Zend/tests/declare_001.phpt b/Zend/tests/declare/declare_001.phpt
similarity index 100%
rename from Zend/tests/declare_001.phpt
rename to Zend/tests/declare/declare_001.phpt
diff --git a/Zend/tests/declare_002.phpt b/Zend/tests/declare/declare_002.phpt
similarity index 100%
rename from Zend/tests/declare_002.phpt
rename to Zend/tests/declare/declare_002.phpt
diff --git a/Zend/tests/declare_003.phpt b/Zend/tests/declare/declare_003.phpt
similarity index 100%
rename from Zend/tests/declare_003.phpt
rename to Zend/tests/declare/declare_003.phpt
diff --git a/Zend/tests/declare_004.phpt b/Zend/tests/declare/declare_004.phpt
similarity index 100%
rename from Zend/tests/declare_004.phpt
rename to Zend/tests/declare/declare_004.phpt
diff --git a/Zend/tests/declare_005.phpt b/Zend/tests/declare/declare_005.phpt
similarity index 100%
rename from Zend/tests/declare_005.phpt
rename to Zend/tests/declare/declare_005.phpt
diff --git a/Zend/tests/declare_006.phpt b/Zend/tests/declare/declare_006.phpt
similarity index 100%
rename from Zend/tests/declare_006.phpt
rename to Zend/tests/declare/declare_006.phpt
diff --git a/Zend/tests/declare_007.phpt b/Zend/tests/declare/declare_007.phpt
similarity index 100%
rename from Zend/tests/declare_007.phpt
rename to Zend/tests/declare/declare_007.phpt
diff --git a/Zend/tests/bug40815.phpt b/Zend/tests/exceptions/exception_handler/bug40815.phpt
similarity index 100%
rename from Zend/tests/bug40815.phpt
rename to Zend/tests/exceptions/exception_handler/bug40815.phpt
diff --git a/Zend/tests/bug47714.phpt b/Zend/tests/exceptions/exception_handler/bug47714.phpt
similarity index 100%
rename from Zend/tests/bug47714.phpt
rename to Zend/tests/exceptions/exception_handler/bug47714.phpt
diff --git a/Zend/tests/exception_handler_001.phpt b/Zend/tests/exceptions/exception_handler/exception_handler_001.phpt
similarity index 100%
rename from Zend/tests/exception_handler_001.phpt
rename to Zend/tests/exceptions/exception_handler/exception_handler_001.phpt
diff --git a/Zend/tests/exception_handler_002.phpt b/Zend/tests/exceptions/exception_handler/exception_handler_002.phpt
similarity index 100%
rename from Zend/tests/exception_handler_002.phpt
rename to Zend/tests/exceptions/exception_handler/exception_handler_002.phpt
diff --git a/Zend/tests/exception_handler_003.phpt b/Zend/tests/exceptions/exception_handler/exception_handler_003.phpt
similarity index 100%
rename from Zend/tests/exception_handler_003.phpt
rename to Zend/tests/exceptions/exception_handler/exception_handler_003.phpt
diff --git a/Zend/tests/exception_handler_004.phpt b/Zend/tests/exceptions/exception_handler/exception_handler_004.phpt
similarity index 100%
rename from Zend/tests/exception_handler_004.phpt
rename to Zend/tests/exceptions/exception_handler/exception_handler_004.phpt
diff --git a/Zend/tests/exception_handler_005.phpt b/Zend/tests/exceptions/exception_handler/exception_handler_005.phpt
similarity index 100%
rename from Zend/tests/exception_handler_005.phpt
rename to Zend/tests/exceptions/exception_handler/exception_handler_005.phpt
diff --git a/Zend/tests/exception_handler_006.phpt b/Zend/tests/exceptions/exception_handler/exception_handler_006.phpt
similarity index 100%
rename from Zend/tests/exception_handler_006.phpt
rename to Zend/tests/exceptions/exception_handler/exception_handler_006.phpt
diff --git a/Zend/tests/exception_handler_007.phpt b/Zend/tests/exceptions/exception_handler/exception_handler_007.phpt
similarity index 100%
rename from Zend/tests/exception_handler_007.phpt
rename to Zend/tests/exceptions/exception_handler/exception_handler_007.phpt
diff --git a/Zend/tests/exit_exception_handler.phpt b/Zend/tests/exceptions/exception_handler/exit_exception_handler.phpt
similarity index 100%
rename from Zend/tests/exit_exception_handler.phpt
rename to Zend/tests/exceptions/exception_handler/exit_exception_handler.phpt
diff --git a/Zend/tests/bug32296.phpt b/Zend/tests/get_class_methods/bug32296.phpt
similarity index 100%
rename from Zend/tests/bug32296.phpt
rename to Zend/tests/get_class_methods/bug32296.phpt
diff --git a/Zend/tests/bug43483.phpt b/Zend/tests/get_class_methods/bug43483.phpt
similarity index 100%
rename from Zend/tests/bug43483.phpt
rename to Zend/tests/get_class_methods/bug43483.phpt
diff --git a/Zend/tests/bug64239_1.phpt b/Zend/tests/get_class_methods/bug64239_1.phpt
similarity index 100%
rename from Zend/tests/bug64239_1.phpt
rename to Zend/tests/get_class_methods/bug64239_1.phpt
diff --git a/Zend/tests/get_class_methods_001.phpt b/Zend/tests/get_class_methods/get_class_methods_001.phpt
similarity index 100%
rename from Zend/tests/get_class_methods_001.phpt
rename to Zend/tests/get_class_methods/get_class_methods_001.phpt
diff --git a/Zend/tests/get_class_methods_002.phpt b/Zend/tests/get_class_methods/get_class_methods_002.phpt
similarity index 100%
rename from Zend/tests/get_class_methods_002.phpt
rename to Zend/tests/get_class_methods/get_class_methods_002.phpt
diff --git a/Zend/tests/get_class_methods_003.phpt b/Zend/tests/get_class_methods/get_class_methods_003.phpt
similarity index 100%
rename from Zend/tests/get_class_methods_003.phpt
rename to Zend/tests/get_class_methods/get_class_methods_003.phpt
diff --git a/Zend/tests/bug29505.phpt b/Zend/tests/get_class_vars/bug29505.phpt
similarity index 100%
rename from Zend/tests/bug29505.phpt
rename to Zend/tests/get_class_vars/bug29505.phpt
diff --git a/Zend/tests/bug45862.phpt b/Zend/tests/get_class_vars/bug45862.phpt
similarity index 100%
rename from Zend/tests/bug45862.phpt
rename to Zend/tests/get_class_vars/bug45862.phpt
diff --git a/Zend/tests/get_class_vars_001.phpt b/Zend/tests/get_class_vars/get_class_vars_001.phpt
similarity index 100%
rename from Zend/tests/get_class_vars_001.phpt
rename to Zend/tests/get_class_vars/get_class_vars_001.phpt
diff --git a/Zend/tests/get_class_vars_002.phpt b/Zend/tests/get_class_vars/get_class_vars_002.phpt
similarity index 100%
rename from Zend/tests/get_class_vars_002.phpt
rename to Zend/tests/get_class_vars/get_class_vars_002.phpt
diff --git a/Zend/tests/get_class_vars_003.phpt b/Zend/tests/get_class_vars/get_class_vars_003.phpt
similarity index 100%
rename from Zend/tests/get_class_vars_003.phpt
rename to Zend/tests/get_class_vars/get_class_vars_003.phpt
diff --git a/Zend/tests/get_class_vars_004.phpt b/Zend/tests/get_class_vars/get_class_vars_004.phpt
similarity index 100%
rename from Zend/tests/get_class_vars_004.phpt
rename to Zend/tests/get_class_vars/get_class_vars_004.phpt
diff --git a/Zend/tests/get_class_vars_005.phpt b/Zend/tests/get_class_vars/get_class_vars_005.phpt
similarity index 100%
rename from Zend/tests/get_class_vars_005.phpt
rename to Zend/tests/get_class_vars/get_class_vars_005.phpt
diff --git a/Zend/tests/get_class_vars_006.phpt b/Zend/tests/get_class_vars/get_class_vars_006.phpt
similarity index 100%
rename from Zend/tests/get_class_vars_006.phpt
rename to Zend/tests/get_class_vars/get_class_vars_006.phpt
diff --git a/Zend/tests/get_class_vars_007.phpt b/Zend/tests/get_class_vars/get_class_vars_007.phpt
similarity index 100%
rename from Zend/tests/get_class_vars_007.phpt
rename to Zend/tests/get_class_vars/get_class_vars_007.phpt
diff --git a/Zend/tests/get_class_vars_typed_props.phpt b/Zend/tests/get_class_vars/get_class_vars_typed_props.phpt
similarity index 100%
rename from Zend/tests/get_class_vars_typed_props.phpt
rename to Zend/tests/get_class_vars/get_class_vars_typed_props.phpt
diff --git a/Zend/tests/bug78363.phpt b/Zend/tests/grammar/bug78363.phpt
similarity index 100%
rename from Zend/tests/bug78363.phpt
rename to Zend/tests/grammar/bug78363.phpt
diff --git a/Zend/tests/bug29883.phpt b/Zend/tests/isset/bug29883.phpt
similarity index 100%
rename from Zend/tests/bug29883.phpt
rename to Zend/tests/isset/bug29883.phpt
diff --git a/Zend/tests/bug62680.phpt b/Zend/tests/isset/bug62680.phpt
similarity index 100%
rename from Zend/tests/bug62680.phpt
rename to Zend/tests/isset/bug62680.phpt
diff --git a/Zend/tests/bug63982.phpt b/Zend/tests/isset/bug63982.phpt
similarity index 100%
rename from Zend/tests/bug63982.phpt
rename to Zend/tests/isset/bug63982.phpt
diff --git a/Zend/tests/bug68162.phpt b/Zend/tests/isset/bug68162.phpt
similarity index 100%
rename from Zend/tests/bug68162.phpt
rename to Zend/tests/isset/bug68162.phpt
diff --git a/Zend/tests/bug74836.phpt b/Zend/tests/isset/bug74836.phpt
similarity index 100%
rename from Zend/tests/bug74836.phpt
rename to Zend/tests/isset/bug74836.phpt
diff --git a/Zend/tests/bug80030.phpt b/Zend/tests/isset/bug80030.phpt
similarity index 100%
rename from Zend/tests/bug80030.phpt
rename to Zend/tests/isset/bug80030.phpt
diff --git a/Zend/tests/isset_001.phpt b/Zend/tests/isset/isset_001.phpt
similarity index 100%
rename from Zend/tests/isset_001.phpt
rename to Zend/tests/isset/isset_001.phpt
diff --git a/Zend/tests/isset_002.phpt b/Zend/tests/isset/isset_002.phpt
similarity index 100%
rename from Zend/tests/isset_002.phpt
rename to Zend/tests/isset/isset_002.phpt
diff --git a/Zend/tests/isset_003.phpt b/Zend/tests/isset/isset_003.phpt
similarity index 100%
rename from Zend/tests/isset_003.phpt
rename to Zend/tests/isset/isset_003.phpt
diff --git a/Zend/tests/isset_array.phpt b/Zend/tests/isset/isset_array.phpt
similarity index 100%
rename from Zend/tests/isset_array.phpt
rename to Zend/tests/isset/isset_array.phpt
diff --git a/Zend/tests/isset_expr_error.phpt b/Zend/tests/isset/isset_expr_error.phpt
similarity index 100%
rename from Zend/tests/isset_expr_error.phpt
rename to Zend/tests/isset/isset_expr_error.phpt
diff --git a/Zend/tests/isset_func_error.phpt b/Zend/tests/isset/isset_func_error.phpt
similarity index 100%
rename from Zend/tests/isset_func_error.phpt
rename to Zend/tests/isset/isset_func_error.phpt
diff --git a/Zend/tests/isset_str_offset.phpt b/Zend/tests/isset/isset_str_offset.phpt
similarity index 100%
rename from Zend/tests/isset_str_offset.phpt
rename to Zend/tests/isset/isset_str_offset.phpt
diff --git a/Zend/tests/this_in_isset.phpt b/Zend/tests/isset/this_in_isset.phpt
similarity index 100%
rename from Zend/tests/this_in_isset.phpt
rename to Zend/tests/isset/this_in_isset.phpt
diff --git a/Zend/tests/declare_already_in_use.phpt b/Zend/tests/name_collision/declare_already_in_use.phpt
similarity index 100%
rename from Zend/tests/declare_already_in_use.phpt
rename to Zend/tests/name_collision/declare_already_in_use.phpt
diff --git a/Zend/tests/delayed_early_binding_redeclaration-1.inc b/Zend/tests/name_collision/delayed_early_binding_redeclaration-1.inc
similarity index 100%
rename from Zend/tests/delayed_early_binding_redeclaration-1.inc
rename to Zend/tests/name_collision/delayed_early_binding_redeclaration-1.inc
diff --git a/Zend/tests/delayed_early_binding_redeclaration-2.inc b/Zend/tests/name_collision/delayed_early_binding_redeclaration-2.inc
similarity index 100%
rename from Zend/tests/delayed_early_binding_redeclaration-2.inc
rename to Zend/tests/name_collision/delayed_early_binding_redeclaration-2.inc
diff --git a/Zend/tests/delayed_early_binding_redeclaration.phpt b/Zend/tests/name_collision/delayed_early_binding_redeclaration.phpt
similarity index 100%
rename from Zend/tests/delayed_early_binding_redeclaration.phpt
rename to Zend/tests/name_collision/delayed_early_binding_redeclaration.phpt
diff --git a/Zend/tests/name_collision_01.phpt b/Zend/tests/name_collision/name_collision_01.phpt
similarity index 100%
rename from Zend/tests/name_collision_01.phpt
rename to Zend/tests/name_collision/name_collision_01.phpt
diff --git a/Zend/tests/name_collision_02.phpt b/Zend/tests/name_collision/name_collision_02.phpt
similarity index 100%
rename from Zend/tests/name_collision_02.phpt
rename to Zend/tests/name_collision/name_collision_02.phpt
diff --git a/Zend/tests/name_collision_03.phpt b/Zend/tests/name_collision/name_collision_03.phpt
similarity index 100%
rename from Zend/tests/name_collision_03.phpt
rename to Zend/tests/name_collision/name_collision_03.phpt
diff --git a/Zend/tests/name_collision_04.phpt b/Zend/tests/name_collision/name_collision_04.phpt
similarity index 100%
rename from Zend/tests/name_collision_04.phpt
rename to Zend/tests/name_collision/name_collision_04.phpt
diff --git a/Zend/tests/name_collision_05.phpt b/Zend/tests/name_collision/name_collision_05.phpt
similarity index 100%
rename from Zend/tests/name_collision_05.phpt
rename to Zend/tests/name_collision/name_collision_05.phpt
diff --git a/Zend/tests/name_collision_06.phpt b/Zend/tests/name_collision/name_collision_06.phpt
similarity index 100%
rename from Zend/tests/name_collision_06.phpt
rename to Zend/tests/name_collision/name_collision_06.phpt
diff --git a/Zend/tests/name_collision_07.phpt b/Zend/tests/name_collision/name_collision_07.phpt
similarity index 100%
rename from Zend/tests/name_collision_07.phpt
rename to Zend/tests/name_collision/name_collision_07.phpt
diff --git a/Zend/tests/name_collision_08.phpt b/Zend/tests/name_collision/name_collision_08.phpt
similarity index 100%
rename from Zend/tests/name_collision_08.phpt
rename to Zend/tests/name_collision/name_collision_08.phpt
diff --git a/Zend/tests/name_collision_09.phpt b/Zend/tests/name_collision/name_collision_09.phpt
similarity index 100%
rename from Zend/tests/name_collision_09.phpt
rename to Zend/tests/name_collision/name_collision_09.phpt