diff --git a/Zend/tests/oss_fuzz_60441.phpt b/Zend/tests/arrow_functions/oss_fuzz_60441.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_60441.phpt
rename to Zend/tests/arrow_functions/oss_fuzz_60441.phpt
diff --git a/Zend/tests/bug29896.phpt b/Zend/tests/backtrace/bug29896.phpt
similarity index 100%
rename from Zend/tests/bug29896.phpt
rename to Zend/tests/backtrace/bug29896.phpt
diff --git a/Zend/tests/break_error_001.phpt b/Zend/tests/break/break_error_001.phpt
similarity index 100%
rename from Zend/tests/break_error_001.phpt
rename to Zend/tests/break/break_error_001.phpt
diff --git a/Zend/tests/break_error_002.phpt b/Zend/tests/break/break_error_002.phpt
similarity index 100%
rename from Zend/tests/break_error_002.phpt
rename to Zend/tests/break/break_error_002.phpt
diff --git a/Zend/tests/break_error_003.phpt b/Zend/tests/break/break_error_003.phpt
similarity index 100%
rename from Zend/tests/break_error_003.phpt
rename to Zend/tests/break/break_error_003.phpt
diff --git a/Zend/tests/break_error_004.phpt b/Zend/tests/break/break_error_004.phpt
similarity index 100%
rename from Zend/tests/break_error_004.phpt
rename to Zend/tests/break/break_error_004.phpt
diff --git a/Zend/tests/bug77660.phpt b/Zend/tests/break/bug77660.phpt
similarity index 100%
rename from Zend/tests/bug77660.phpt
rename to Zend/tests/break/bug77660.phpt
diff --git a/Zend/tests/bug22836.phpt b/Zend/tests/by_ref_return/bug22836.phpt
similarity index 100%
rename from Zend/tests/bug22836.phpt
rename to Zend/tests/by_ref_return/bug22836.phpt
diff --git a/Zend/tests/bug33558.phpt b/Zend/tests/by_ref_return/bug33558.phpt
similarity index 100%
rename from Zend/tests/bug33558.phpt
rename to Zend/tests/by_ref_return/bug33558.phpt
diff --git a/Zend/tests/bug70117.phpt b/Zend/tests/by_ref_return/bug70117.phpt
similarity index 100%
rename from Zend/tests/bug70117.phpt
rename to Zend/tests/by_ref_return/bug70117.phpt
diff --git a/Zend/tests/gh16515.phpt b/Zend/tests/by_ref_return/gh16515.phpt
similarity index 100%
rename from Zend/tests/gh16515.phpt
rename to Zend/tests/by_ref_return/gh16515.phpt
diff --git a/Zend/tests/gh18736.phpt b/Zend/tests/by_ref_return/gh18736.phpt
similarity index 100%
rename from Zend/tests/gh18736.phpt
rename to Zend/tests/by_ref_return/gh18736.phpt
diff --git a/Zend/tests/return_by_ref_from_void_function.phpt b/Zend/tests/by_ref_return/return_by_ref_from_void_function.phpt
similarity index 100%
rename from Zend/tests/return_by_ref_from_void_function.phpt
rename to Zend/tests/by_ref_return/return_by_ref_from_void_function.phpt
diff --git a/Zend/tests/return_ref_none.phpt b/Zend/tests/by_ref_return/return_ref_none.phpt
similarity index 100%
rename from Zend/tests/return_ref_none.phpt
rename to Zend/tests/by_ref_return/return_ref_none.phpt
diff --git a/Zend/tests/bug79022.phpt b/Zend/tests/class_exists/bug79022.phpt
similarity index 100%
rename from Zend/tests/bug79022.phpt
rename to Zend/tests/class_exists/bug79022.phpt
diff --git a/Zend/tests/class_exists_001.phpt b/Zend/tests/class_exists/class_exists_001.phpt
similarity index 100%
rename from Zend/tests/class_exists_001.phpt
rename to Zend/tests/class_exists/class_exists_001.phpt
diff --git a/Zend/tests/class_exists_002.phpt b/Zend/tests/class_exists/class_exists_002.phpt
similarity index 100%
rename from Zend/tests/class_exists_002.phpt
rename to Zend/tests/class_exists/class_exists_002.phpt
diff --git a/Zend/tests/class_exists_003.phpt b/Zend/tests/class_exists/class_exists_003.phpt
similarity index 100%
rename from Zend/tests/class_exists_003.phpt
rename to Zend/tests/class_exists/class_exists_003.phpt
diff --git a/Zend/tests/class_exists_basic.phpt b/Zend/tests/class_exists/class_exists_basic.phpt
similarity index 100%
rename from Zend/tests/class_exists_basic.phpt
rename to Zend/tests/class_exists/class_exists_basic.phpt
diff --git a/Zend/tests/bug69755.phpt b/Zend/tests/concat/bug69755.phpt
similarity index 100%
rename from Zend/tests/bug69755.phpt
rename to Zend/tests/concat/bug69755.phpt
diff --git a/Zend/tests/bug37811.phpt b/Zend/tests/constants/bug37811.phpt
similarity index 100%
rename from Zend/tests/bug37811.phpt
rename to Zend/tests/constants/bug37811.phpt
diff --git a/Zend/tests/bug42143.phpt b/Zend/tests/constants/bug42143.phpt
similarity index 100%
rename from Zend/tests/bug42143.phpt
rename to Zend/tests/constants/bug42143.phpt
diff --git a/Zend/tests/bug79919.phpt b/Zend/tests/constants/bug79919.phpt
similarity index 100%
rename from Zend/tests/bug79919.phpt
rename to Zend/tests/constants/bug79919.phpt
diff --git a/Zend/tests/e_strict-deprecated.phpt b/Zend/tests/constants/e_strict-deprecated.phpt
similarity index 100%
rename from Zend/tests/e_strict-deprecated.phpt
rename to Zend/tests/constants/e_strict-deprecated.phpt
diff --git a/Zend/tests/gh10486.phpt b/Zend/tests/constants/gh10486.phpt
similarity index 100%
rename from Zend/tests/gh10486.phpt
rename to Zend/tests/constants/gh10486.phpt
diff --git a/Zend/tests/gh10486_2.phpt b/Zend/tests/constants/gh10486_2.phpt
similarity index 100%
rename from Zend/tests/gh10486_2.phpt
rename to Zend/tests/constants/gh10486_2.phpt
diff --git a/Zend/tests/gh12366.inc b/Zend/tests/constants/gh12366.inc
similarity index 100%
rename from Zend/tests/gh12366.inc
rename to Zend/tests/constants/gh12366.inc
diff --git a/Zend/tests/gh12366.phpt b/Zend/tests/constants/gh12366.phpt
similarity index 100%
rename from Zend/tests/gh12366.phpt
rename to Zend/tests/constants/gh12366.phpt
diff --git a/Zend/tests/oss_fuzz_410939023.phpt b/Zend/tests/constants/oss_fuzz_410939023.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_410939023.phpt
rename to Zend/tests/constants/oss_fuzz_410939023.phpt
diff --git a/Zend/tests/__debugInfo_reference.phpt b/Zend/tests/debug_info/__debugInfo_reference.phpt
similarity index 100%
rename from Zend/tests/__debugInfo_reference.phpt
rename to Zend/tests/debug_info/__debugInfo_reference.phpt
diff --git a/Zend/tests/gh19719.phpt b/Zend/tests/declare/gh19719.phpt
similarity index 100%
rename from Zend/tests/gh19719.phpt
rename to Zend/tests/declare/gh19719.phpt
diff --git a/Zend/tests/dynamic_prop_deprecation.phpt b/Zend/tests/dynamic_properties/dynamic_prop_deprecation.phpt
similarity index 100%
rename from Zend/tests/dynamic_prop_deprecation.phpt
rename to Zend/tests/dynamic_properties/dynamic_prop_deprecation.phpt
diff --git a/Zend/tests/dynamic_prop_deprecation_002.phpt b/Zend/tests/dynamic_properties/dynamic_prop_deprecation_002.phpt
similarity index 100%
rename from Zend/tests/dynamic_prop_deprecation_002.phpt
rename to Zend/tests/dynamic_properties/dynamic_prop_deprecation_002.phpt
diff --git a/Zend/tests/dynamic_prop_name_leak.phpt b/Zend/tests/dynamic_properties/dynamic_prop_name_leak.phpt
similarity index 100%
rename from Zend/tests/dynamic_prop_name_leak.phpt
rename to Zend/tests/dynamic_properties/dynamic_prop_name_leak.phpt
diff --git a/Zend/tests/bug29890.phpt b/Zend/tests/error_handler/bug29890.phpt
similarity index 100%
rename from Zend/tests/bug29890.phpt
rename to Zend/tests/error_handler/bug29890.phpt
diff --git a/Zend/tests/bug30998.phpt b/Zend/tests/error_handler/bug30998.phpt
similarity index 100%
rename from Zend/tests/bug30998.phpt
rename to Zend/tests/error_handler/bug30998.phpt
diff --git a/Zend/tests/bug35017.phpt b/Zend/tests/error_handler/bug35017.phpt
similarity index 100%
rename from Zend/tests/bug35017.phpt
rename to Zend/tests/error_handler/bug35017.phpt
diff --git a/Zend/tests/bug46196.phpt b/Zend/tests/error_handler/bug46196.phpt
similarity index 100%
rename from Zend/tests/bug46196.phpt
rename to Zend/tests/error_handler/bug46196.phpt
diff --git a/Zend/tests/bug46241.phpt b/Zend/tests/error_handler/bug46241.phpt
similarity index 100%
rename from Zend/tests/bug46241.phpt
rename to Zend/tests/error_handler/bug46241.phpt
diff --git a/Zend/tests/bug60738.phpt b/Zend/tests/error_handler/bug60738.phpt
similarity index 100%
rename from Zend/tests/bug60738.phpt
rename to Zend/tests/error_handler/bug60738.phpt
diff --git a/Zend/tests/bug60738_variation.phpt b/Zend/tests/error_handler/bug60738_variation.phpt
similarity index 100%
rename from Zend/tests/bug60738_variation.phpt
rename to Zend/tests/error_handler/bug60738_variation.phpt
diff --git a/Zend/tests/bug63206.phpt b/Zend/tests/error_handler/bug63206.phpt
similarity index 100%
rename from Zend/tests/bug63206.phpt
rename to Zend/tests/error_handler/bug63206.phpt
diff --git a/Zend/tests/bug63206_1.phpt b/Zend/tests/error_handler/bug63206_1.phpt
similarity index 100%
rename from Zend/tests/bug63206_1.phpt
rename to Zend/tests/error_handler/bug63206_1.phpt
diff --git a/Zend/tests/bug63206_2.phpt b/Zend/tests/error_handler/bug63206_2.phpt
similarity index 100%
rename from Zend/tests/bug63206_2.phpt
rename to Zend/tests/error_handler/bug63206_2.phpt
diff --git a/Zend/tests/bug64578.phpt b/Zend/tests/error_handler/bug64578.phpt
similarity index 100%
rename from Zend/tests/bug64578.phpt
rename to Zend/tests/error_handler/bug64578.phpt
diff --git a/Zend/tests/bug70689.phpt b/Zend/tests/error_handler/bug70689.phpt
similarity index 100%
rename from Zend/tests/bug70689.phpt
rename to Zend/tests/error_handler/bug70689.phpt
diff --git a/Zend/tests/bug72107.phpt b/Zend/tests/error_handler/bug72107.phpt
similarity index 100%
rename from Zend/tests/bug72107.phpt
rename to Zend/tests/error_handler/bug72107.phpt
diff --git a/Zend/tests/bug76534.phpt b/Zend/tests/error_handler/bug76534.phpt
similarity index 100%
rename from Zend/tests/bug76534.phpt
rename to Zend/tests/error_handler/bug76534.phpt
diff --git a/Zend/tests/bug79599.phpt b/Zend/tests/error_handler/bug79599.phpt
similarity index 100%
rename from Zend/tests/bug79599.phpt
rename to Zend/tests/error_handler/bug79599.phpt
diff --git a/Zend/tests/bug80781.phpt b/Zend/tests/error_handler/bug80781.phpt
similarity index 100%
rename from Zend/tests/bug80781.phpt
rename to Zend/tests/error_handler/bug80781.phpt
diff --git a/Zend/tests/get_error_handler.phpt b/Zend/tests/error_handler/get_error_handler.phpt
similarity index 100%
rename from Zend/tests/get_error_handler.phpt
rename to Zend/tests/error_handler/get_error_handler.phpt
diff --git a/Zend/tests/gh_21699.phpt b/Zend/tests/error_handler/gh_21699.phpt
similarity index 100%
rename from Zend/tests/gh_21699.phpt
rename to Zend/tests/error_handler/gh_21699.phpt
diff --git a/Zend/tests/gh_21699_parent.phpt b/Zend/tests/error_handler/gh_21699_parent.phpt
similarity index 100%
rename from Zend/tests/gh_21699_parent.phpt
rename to Zend/tests/error_handler/gh_21699_parent.phpt
diff --git a/Zend/tests/gh_21699_static.phpt b/Zend/tests/error_handler/gh_21699_static.phpt
similarity index 100%
rename from Zend/tests/gh_21699_static.phpt
rename to Zend/tests/error_handler/gh_21699_static.phpt
diff --git a/Zend/tests/oss_fuzz_54325.phpt b/Zend/tests/error_handler/oss_fuzz_54325.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_54325.phpt
rename to Zend/tests/error_handler/oss_fuzz_54325.phpt
diff --git a/Zend/tests/oss_fuzz_61712.phpt b/Zend/tests/error_handler/oss_fuzz_61712.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_61712.phpt
rename to Zend/tests/error_handler/oss_fuzz_61712.phpt
diff --git a/Zend/tests/oss_fuzz_61712b.phpt b/Zend/tests/error_handler/oss_fuzz_61712b.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_61712b.phpt
rename to Zend/tests/error_handler/oss_fuzz_61712b.phpt
diff --git a/Zend/tests/bug32428.phpt b/Zend/tests/error_suppression/bug32428.phpt
similarity index 100%
rename from Zend/tests/bug32428.phpt
rename to Zend/tests/error_suppression/bug32428.phpt
diff --git a/Zend/tests/bug34786.phpt b/Zend/tests/error_suppression/bug34786.phpt
similarity index 100%
rename from Zend/tests/bug34786.phpt
rename to Zend/tests/error_suppression/bug34786.phpt
diff --git a/Zend/tests/bug39018.phpt b/Zend/tests/error_suppression/bug39018.phpt
similarity index 100%
rename from Zend/tests/bug39018.phpt
rename to Zend/tests/error_suppression/bug39018.phpt
diff --git a/Zend/tests/bug39018_2.phpt b/Zend/tests/error_suppression/bug39018_2.phpt
similarity index 100%
rename from Zend/tests/bug39018_2.phpt
rename to Zend/tests/error_suppression/bug39018_2.phpt
diff --git a/Zend/tests/restore_error_reporting.phpt b/Zend/tests/error_suppression/restore_error_reporting.phpt
similarity index 100%
rename from Zend/tests/restore_error_reporting.phpt
rename to Zend/tests/error_suppression/restore_error_reporting.phpt
diff --git a/Zend/tests/exception_ignore_args.phpt b/Zend/tests/exceptions/exception_ignore_args.phpt
similarity index 100%
rename from Zend/tests/exception_ignore_args.phpt
rename to Zend/tests/exceptions/exception_ignore_args.phpt
diff --git a/Zend/tests/exception_in_nested_rope.phpt b/Zend/tests/exceptions/exception_in_nested_rope.phpt
similarity index 100%
rename from Zend/tests/exception_in_nested_rope.phpt
rename to Zend/tests/exceptions/exception_in_nested_rope.phpt
diff --git a/Zend/tests/exception_in_rope_end.phpt b/Zend/tests/exceptions/exception_in_rope_end.phpt
similarity index 100%
rename from Zend/tests/exception_in_rope_end.phpt
rename to Zend/tests/exceptions/exception_in_rope_end.phpt
diff --git a/Zend/tests/exception_set_previous_leak.phpt b/Zend/tests/exceptions/exception_set_previous_leak.phpt
similarity index 100%
rename from Zend/tests/exception_set_previous_leak.phpt
rename to Zend/tests/exceptions/exception_set_previous_leak.phpt
diff --git a/Zend/tests/exception_stream_wrapper.phpt b/Zend/tests/exceptions/exception_stream_wrapper.phpt
similarity index 100%
rename from Zend/tests/exception_stream_wrapper.phpt
rename to Zend/tests/exceptions/exception_stream_wrapper.phpt
diff --git a/Zend/tests/exception_with_by_ref_message.phpt b/Zend/tests/exceptions/exception_with_by_ref_message.phpt
similarity index 100%
rename from Zend/tests/exception_with_by_ref_message.phpt
rename to Zend/tests/exceptions/exception_with_by_ref_message.phpt
diff --git a/Zend/tests/exit_finally_1.phpt b/Zend/tests/exit/exit_finally_1.phpt
similarity index 100%
rename from Zend/tests/exit_finally_1.phpt
rename to Zend/tests/exit/exit_finally_1.phpt
diff --git a/Zend/tests/exit_finally_2.phpt b/Zend/tests/exit/exit_finally_2.phpt
similarity index 100%
rename from Zend/tests/exit_finally_2.phpt
rename to Zend/tests/exit/exit_finally_2.phpt
diff --git a/Zend/tests/exit_finally_3.phpt b/Zend/tests/exit/exit_finally_3.phpt
similarity index 100%
rename from Zend/tests/exit_finally_3.phpt
rename to Zend/tests/exit/exit_finally_3.phpt
diff --git a/Zend/tests/bug71266.phpt b/Zend/tests/foreach/bug71266.phpt
similarity index 100%
rename from Zend/tests/bug71266.phpt
rename to Zend/tests/foreach/bug71266.phpt
diff --git a/Zend/tests/bug71470.phpt b/Zend/tests/foreach/bug71470.phpt
similarity index 100%
rename from Zend/tests/bug71470.phpt
rename to Zend/tests/foreach/bug71470.phpt
diff --git a/Zend/tests/gc_051.phpt b/Zend/tests/gc/gc_051.phpt
similarity index 100%
rename from Zend/tests/gc_051.phpt
rename to Zend/tests/gc/gc_051.phpt
diff --git a/Zend/tests/gc_052.phpt b/Zend/tests/gc/gc_052.phpt
similarity index 100%
rename from Zend/tests/gc_052.phpt
rename to Zend/tests/gc/gc_052.phpt
diff --git a/Zend/tests/gc_053.phpt b/Zend/tests/gc/gc_053.phpt
similarity index 100%
rename from Zend/tests/gc_053.phpt
rename to Zend/tests/gc/gc_053.phpt
diff --git a/Zend/tests/gh13569.phpt b/Zend/tests/gc/gh13569.phpt
similarity index 100%
rename from Zend/tests/gh13569.phpt
rename to Zend/tests/gc/gh13569.phpt
diff --git a/Zend/tests/gh13670_001.phpt b/Zend/tests/gc/gh13670_001.phpt
similarity index 100%
rename from Zend/tests/gh13670_001.phpt
rename to Zend/tests/gc/gh13670_001.phpt
diff --git a/Zend/tests/gh13670_002.phpt b/Zend/tests/gc/gh13670_002.phpt
similarity index 100%
rename from Zend/tests/gh13670_002.phpt
rename to Zend/tests/gc/gh13670_002.phpt
diff --git a/Zend/tests/gh13670_003.phpt b/Zend/tests/gc/gh13670_003.phpt
similarity index 100%
rename from Zend/tests/gh13670_003.phpt
rename to Zend/tests/gc/gh13670_003.phpt
diff --git a/Zend/tests/gh19543-001.phpt b/Zend/tests/gc/gh19543-001.phpt
similarity index 100%
rename from Zend/tests/gh19543-001.phpt
rename to Zend/tests/gc/gh19543-001.phpt
diff --git a/Zend/tests/gh19543-002.phpt b/Zend/tests/gc/gh19543-002.phpt
similarity index 100%
rename from Zend/tests/gh19543-002.phpt
rename to Zend/tests/gc/gh19543-002.phpt
diff --git a/Zend/tests/gh19306.phpt b/Zend/tests/generators/gh19306.phpt
similarity index 100%
rename from Zend/tests/gh19306.phpt
rename to Zend/tests/generators/gh19306.phpt
diff --git a/Zend/tests/gh19326.phpt b/Zend/tests/generators/gh19326.phpt
similarity index 100%
rename from Zend/tests/gh19326.phpt
rename to Zend/tests/generators/gh19326.phpt
diff --git a/Zend/tests/gh20714.phpt b/Zend/tests/generators/gh20714.phpt
similarity index 100%
rename from Zend/tests/gh20714.phpt
rename to Zend/tests/generators/gh20714.phpt
diff --git a/Zend/tests/bug26010.phpt b/Zend/tests/get_object_vars/bug26010.phpt
similarity index 100%
rename from Zend/tests/bug26010.phpt
rename to Zend/tests/get_object_vars/bug26010.phpt
diff --git a/Zend/tests/bug27798.phpt b/Zend/tests/get_object_vars/bug27798.phpt
similarity index 100%
rename from Zend/tests/bug27798.phpt
rename to Zend/tests/get_object_vars/bug27798.phpt
diff --git a/Zend/tests/bug40757.phpt b/Zend/tests/get_object_vars/bug40757.phpt
similarity index 100%
rename from Zend/tests/bug40757.phpt
rename to Zend/tests/get_object_vars/bug40757.phpt
diff --git a/Zend/tests/bug71336.phpt b/Zend/tests/get_object_vars/bug71336.phpt
similarity index 100%
rename from Zend/tests/bug71336.phpt
rename to Zend/tests/get_object_vars/bug71336.phpt
diff --git a/Zend/tests/bug73998.phpt b/Zend/tests/get_object_vars/bug73998.phpt
similarity index 100%
rename from Zend/tests/bug73998.phpt
rename to Zend/tests/get_object_vars/bug73998.phpt
diff --git a/Zend/tests/gh20177.phpt b/Zend/tests/get_object_vars/gh20177.phpt
similarity index 100%
rename from Zend/tests/gh20177.phpt
rename to Zend/tests/get_object_vars/gh20177.phpt
diff --git a/Zend/tests/oct_whitespace.phpt b/Zend/tests/grammar/oct_whitespace.phpt
similarity index 100%
rename from Zend/tests/oct_whitespace.phpt
rename to Zend/tests/grammar/oct_whitespace.phpt
diff --git a/Zend/tests/bug42767.phpt b/Zend/tests/highlight_string_file/bug42767.phpt
similarity index 100%
rename from Zend/tests/bug42767.phpt
rename to Zend/tests/highlight_string_file/bug42767.phpt
diff --git a/Zend/tests/bug53629.phpt b/Zend/tests/highlight_string_file/bug53629.phpt
similarity index 100%
rename from Zend/tests/bug53629.phpt
rename to Zend/tests/highlight_string_file/bug53629.phpt
diff --git a/Zend/tests/67468.phpt b/Zend/tests/highlight_string_file/bug67468.phpt
similarity index 100%
rename from Zend/tests/67468.phpt
rename to Zend/tests/highlight_string_file/bug67468.phpt
diff --git a/Zend/tests/bug71086.phpt b/Zend/tests/highlight_string_file/bug71086.phpt
similarity index 100%
rename from Zend/tests/bug71086.phpt
rename to Zend/tests/highlight_string_file/bug71086.phpt
diff --git a/Zend/tests/bug71871.phpt b/Zend/tests/interfaces/bug71871.phpt
similarity index 100%
rename from Zend/tests/bug71871.phpt
rename to Zend/tests/interfaces/bug71871.phpt
diff --git a/Zend/tests/bug71871_2.phpt b/Zend/tests/interfaces/bug71871_2.phpt
similarity index 100%
rename from Zend/tests/bug71871_2.phpt
rename to Zend/tests/interfaces/bug71871_2.phpt
diff --git a/Zend/tests/interface_extends_static.phpt b/Zend/tests/interfaces/interface_extends_static.phpt
similarity index 100%
rename from Zend/tests/interface_extends_static.phpt
rename to Zend/tests/interfaces/interface_extends_static.phpt
diff --git a/Zend/tests/interface_underscore_as_name.phpt b/Zend/tests/interfaces/interface_underscore_as_name.phpt
similarity index 100%
rename from Zend/tests/interface_underscore_as_name.phpt
rename to Zend/tests/interfaces/interface_underscore_as_name.phpt
diff --git a/Zend/tests/bug29210.phpt b/Zend/tests/is_callable/bug29210.phpt
similarity index 100%
rename from Zend/tests/bug29210.phpt
rename to Zend/tests/is_callable/bug29210.phpt
diff --git a/Zend/tests/bug34678.phpt b/Zend/tests/is_callable/bug34678.phpt
similarity index 100%
rename from Zend/tests/bug34678.phpt
rename to Zend/tests/is_callable/bug34678.phpt
diff --git a/Zend/tests/bug43651.phpt b/Zend/tests/is_callable/bug43651.phpt
similarity index 100%
rename from Zend/tests/bug43651.phpt
rename to Zend/tests/is_callable/bug43651.phpt
diff --git a/Zend/tests/bug48899-deprecated.phpt b/Zend/tests/is_callable/bug48899-deprecated.phpt
similarity index 100%
rename from Zend/tests/bug48899-deprecated.phpt
rename to Zend/tests/is_callable/bug48899-deprecated.phpt
diff --git a/Zend/tests/bug48899.phpt b/Zend/tests/is_callable/bug48899.phpt
similarity index 100%
rename from Zend/tests/bug48899.phpt
rename to Zend/tests/is_callable/bug48899.phpt
diff --git a/Zend/tests/bug63111.phpt b/Zend/tests/is_callable/bug63111.phpt
similarity index 100%
rename from Zend/tests/bug63111.phpt
rename to Zend/tests/is_callable/bug63111.phpt
diff --git a/Zend/tests/bug65108.phpt b/Zend/tests/is_callable/bug65108.phpt
similarity index 100%
rename from Zend/tests/bug65108.phpt
rename to Zend/tests/is_callable/bug65108.phpt
diff --git a/Zend/tests/bug69315.phpt b/Zend/tests/is_callable/bug69315.phpt
similarity index 100%
rename from Zend/tests/bug69315.phpt
rename to Zend/tests/is_callable/bug69315.phpt
diff --git a/Zend/tests/callable_param_exception_leak.phpt b/Zend/tests/is_callable/callable_param_exception_leak.phpt
similarity index 100%
rename from Zend/tests/callable_param_exception_leak.phpt
rename to Zend/tests/is_callable/callable_param_exception_leak.phpt
diff --git a/Zend/tests/is_callable_trampoline_uaf-deprecated.phpt b/Zend/tests/is_callable/is_callable_trampoline_uaf-deprecated.phpt
similarity index 100%
rename from Zend/tests/is_callable_trampoline_uaf-deprecated.phpt
rename to Zend/tests/is_callable/is_callable_trampoline_uaf-deprecated.phpt
diff --git a/Zend/tests/is_callable_trampoline_uaf.phpt b/Zend/tests/is_callable/is_callable_trampoline_uaf.phpt
similarity index 100%
rename from Zend/tests/is_callable_trampoline_uaf.phpt
rename to Zend/tests/is_callable/is_callable_trampoline_uaf.phpt
diff --git a/Zend/tests/bug26229.phpt b/Zend/tests/iterators/bug26229.phpt
similarity index 100%
rename from Zend/tests/bug26229.phpt
rename to Zend/tests/iterators/bug26229.phpt
diff --git a/Zend/tests/bug32674.phpt b/Zend/tests/iterators/bug32674.phpt
similarity index 100%
rename from Zend/tests/bug32674.phpt
rename to Zend/tests/iterators/bug32674.phpt
diff --git a/Zend/tests/bug32993.phpt b/Zend/tests/iterators/bug32993.phpt
similarity index 100%
rename from Zend/tests/bug32993.phpt
rename to Zend/tests/iterators/bug32993.phpt
diff --git a/Zend/tests/bug48667_1.phpt b/Zend/tests/iterators/bug48667_1.phpt
similarity index 100%
rename from Zend/tests/bug48667_1.phpt
rename to Zend/tests/iterators/bug48667_1.phpt
diff --git a/Zend/tests/bug48667_2.phpt b/Zend/tests/iterators/bug48667_2.phpt
similarity index 100%
rename from Zend/tests/bug48667_2.phpt
rename to Zend/tests/iterators/bug48667_2.phpt
diff --git a/Zend/tests/bug49269.phpt b/Zend/tests/iterators/bug49269.phpt
similarity index 100%
rename from Zend/tests/bug49269.phpt
rename to Zend/tests/iterators/bug49269.phpt
diff --git a/Zend/tests/bug71154.phpt b/Zend/tests/iterators/bug71154.phpt
similarity index 100%
rename from Zend/tests/bug71154.phpt
rename to Zend/tests/iterators/bug71154.phpt
diff --git a/Zend/tests/bug72767.phpt b/Zend/tests/iterators/bug72767.phpt
similarity index 100%
rename from Zend/tests/bug72767.phpt
rename to Zend/tests/iterators/bug72767.phpt
diff --git a/Zend/tests/gh7958.phpt b/Zend/tests/iterators/gh7958.phpt
similarity index 100%
rename from Zend/tests/gh7958.phpt
rename to Zend/tests/iterators/gh7958.phpt
diff --git a/Zend/tests/iterator_key_by_ref.phpt b/Zend/tests/iterators/iterator_key_by_ref.phpt
similarity index 100%
rename from Zend/tests/iterator_key_by_ref.phpt
rename to Zend/tests/iterators/iterator_key_by_ref.phpt
diff --git a/Zend/tests/oss_fuzz_58181.phpt b/Zend/tests/iterators/oss_fuzz_58181.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_58181.phpt
rename to Zend/tests/iterators/oss_fuzz_58181.phpt
diff --git a/Zend/tests/bug75426.phpt b/Zend/tests/line_numbers/bug75426.phpt
similarity index 100%
rename from Zend/tests/bug75426.phpt
rename to Zend/tests/line_numbers/bug75426.phpt
diff --git a/Zend/tests/gh14969.phpt b/Zend/tests/magic_methods/gh14969.phpt
similarity index 100%
rename from Zend/tests/gh14969.phpt
rename to Zend/tests/magic_methods/gh14969.phpt
diff --git a/Zend/tests/gh21603.phpt b/Zend/tests/magic_methods/gh21603.phpt
similarity index 100%
rename from Zend/tests/gh21603.phpt
rename to Zend/tests/magic_methods/gh21603.phpt
diff --git a/Zend/tests/gh_17718_001.phpt b/Zend/tests/magic_methods/gh_17718_001.phpt
similarity index 100%
rename from Zend/tests/gh_17718_001.phpt
rename to Zend/tests/magic_methods/gh_17718_001.phpt
diff --git a/Zend/tests/gh_17718_002.phpt b/Zend/tests/magic_methods/gh_17718_002.phpt
similarity index 100%
rename from Zend/tests/gh_17718_002.phpt
rename to Zend/tests/magic_methods/gh_17718_002.phpt
diff --git a/Zend/tests/object_handlers.phpt b/Zend/tests/magic_methods/object_handlers.phpt
similarity index 100%
rename from Zend/tests/object_handlers.phpt
rename to Zend/tests/magic_methods/object_handlers.phpt
diff --git a/Zend/tests/gh418106144.phpt b/Zend/tests/magic_methods/oss_fuzz_418106144.phpt
similarity index 100%
rename from Zend/tests/gh418106144.phpt
rename to Zend/tests/magic_methods/oss_fuzz_418106144.phpt
diff --git a/Zend/tests/oss_fuzz_434346548.phpt b/Zend/tests/magic_methods/oss_fuzz_434346548.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_434346548.phpt
rename to Zend/tests/magic_methods/oss_fuzz_434346548.phpt
diff --git a/Zend/tests/pipe_operator_reference_context.phpt b/Zend/tests/pipe_operator/pipe_operator_reference_context.phpt
similarity index 100%
rename from Zend/tests/pipe_operator_reference_context.phpt
rename to Zend/tests/pipe_operator/pipe_operator_reference_context.phpt
diff --git a/Zend/tests/gh18907.phpt b/Zend/tests/property_hooks/gh18907.phpt
similarity index 100%
rename from Zend/tests/gh18907.phpt
rename to Zend/tests/property_hooks/gh18907.phpt
diff --git a/Zend/tests/oss-fuzz-403816122.phpt b/Zend/tests/property_hooks/oss-fuzz-403816122.phpt
similarity index 100%
rename from Zend/tests/oss-fuzz-403816122.phpt
rename to Zend/tests/property_hooks/oss-fuzz-403816122.phpt
diff --git a/Zend/tests/oss-fuzz-471486164-001.phpt b/Zend/tests/property_hooks/oss-fuzz-471486164-001.phpt
similarity index 100%
rename from Zend/tests/oss-fuzz-471486164-001.phpt
rename to Zend/tests/property_hooks/oss-fuzz-471486164-001.phpt
diff --git a/Zend/tests/oss-fuzz-471486164-002.phpt b/Zend/tests/property_hooks/oss-fuzz-471486164-002.phpt
similarity index 100%
rename from Zend/tests/oss-fuzz-471486164-002.phpt
rename to Zend/tests/property_hooks/oss-fuzz-471486164-002.phpt
diff --git a/Zend/tests/oss-fuzz-478009707.phpt b/Zend/tests/property_hooks/oss-fuzz-478009707.phpt
similarity index 100%
rename from Zend/tests/oss-fuzz-478009707.phpt
rename to Zend/tests/property_hooks/oss-fuzz-478009707.phpt
diff --git a/Zend/tests/bug51827.phpt b/Zend/tests/shutdown_functions/bug51827.phpt
similarity index 100%
rename from Zend/tests/bug51827.phpt
rename to Zend/tests/shutdown_functions/bug51827.phpt
diff --git a/Zend/tests/bug60909_1.phpt b/Zend/tests/shutdown_functions/bug60909_1.phpt
similarity index 100%
rename from Zend/tests/bug60909_1.phpt
rename to Zend/tests/shutdown_functions/bug60909_1.phpt
diff --git a/Zend/tests/bug60909_2.phpt b/Zend/tests/shutdown_functions/bug60909_2.phpt
similarity index 100%
rename from Zend/tests/bug60909_2.phpt
rename to Zend/tests/shutdown_functions/bug60909_2.phpt
diff --git a/Zend/tests/bug61767.phpt b/Zend/tests/shutdown_functions/bug61767.phpt
similarity index 100%
rename from Zend/tests/bug61767.phpt
rename to Zend/tests/shutdown_functions/bug61767.phpt
diff --git a/Zend/tests/bug62763.phpt b/Zend/tests/shutdown_functions/bug62763.phpt
similarity index 100%
rename from Zend/tests/bug62763.phpt
rename to Zend/tests/shutdown_functions/bug62763.phpt
diff --git a/Zend/tests/bug76846.phpt b/Zend/tests/shutdown_functions/bug76846.phpt
similarity index 100%
rename from Zend/tests/bug76846.phpt
rename to Zend/tests/shutdown_functions/bug76846.phpt
diff --git a/Zend/tests/bug78396.phpt b/Zend/tests/shutdown_functions/bug78396.phpt
similarity index 100%
rename from Zend/tests/bug78396.phpt
rename to Zend/tests/shutdown_functions/bug78396.phpt
diff --git a/Zend/tests/gh10072-2.phpt b/Zend/tests/shutdown_functions/gh10072-2.phpt
similarity index 100%
rename from Zend/tests/gh10072-2.phpt
rename to Zend/tests/shutdown_functions/gh10072-2.phpt
diff --git a/Zend/tests/object_gc_in_shutdown.phpt b/Zend/tests/shutdown_functions/object_gc_in_shutdown.phpt
similarity index 100%
rename from Zend/tests/object_gc_in_shutdown.phpt
rename to Zend/tests/shutdown_functions/object_gc_in_shutdown.phpt
diff --git a/Zend/tests/register_shutdown_function_refcount.phpt b/Zend/tests/shutdown_functions/register_shutdown_function_refcount.phpt
similarity index 100%
rename from Zend/tests/register_shutdown_function_refcount.phpt
rename to Zend/tests/shutdown_functions/register_shutdown_function_refcount.phpt
diff --git a/Zend/tests/bug38779.phpt b/Zend/tests/streams/bug38779.phpt
similarity index 100%
rename from Zend/tests/bug38779.phpt
rename to Zend/tests/streams/bug38779.phpt
diff --git a/Zend/tests/bug38779_1.phpt b/Zend/tests/streams/bug38779_1.phpt
similarity index 100%
rename from Zend/tests/bug38779_1.phpt
rename to Zend/tests/streams/bug38779_1.phpt
diff --git a/Zend/tests/bug41421.phpt b/Zend/tests/streams/bug41421.phpt
similarity index 100%
rename from Zend/tests/bug41421.phpt
rename to Zend/tests/streams/bug41421.phpt
diff --git a/Zend/tests/bug78340.phpt b/Zend/tests/streams/bug78340.phpt
similarity index 100%
rename from Zend/tests/bug78340.phpt
rename to Zend/tests/streams/bug78340.phpt
diff --git a/Zend/tests/gh10072.phpt b/Zend/tests/streams/gh10072.phpt
similarity index 100%
rename from Zend/tests/gh10072.phpt
rename to Zend/tests/streams/gh10072.phpt
diff --git a/Zend/tests/gh11735_1.phpt b/Zend/tests/streams/gh11735_1.phpt
similarity index 100%
rename from Zend/tests/gh11735_1.phpt
rename to Zend/tests/streams/gh11735_1.phpt
diff --git a/Zend/tests/gh11735_2.phpt b/Zend/tests/streams/gh11735_2.phpt
similarity index 100%
rename from Zend/tests/gh11735_2.phpt
rename to Zend/tests/streams/gh11735_2.phpt
diff --git a/Zend/tests/gh19844.phpt b/Zend/tests/streams/gh19844.phpt
similarity index 100%
rename from Zend/tests/gh19844.phpt
rename to Zend/tests/streams/gh19844.phpt
diff --git a/Zend/tests/gh8548.phpt b/Zend/tests/streams/gh8548.phpt
similarity index 100%
rename from Zend/tests/gh8548.phpt
rename to Zend/tests/streams/gh8548.phpt
diff --git a/Zend/tests/gh8548_2.phpt b/Zend/tests/streams/gh8548_2.phpt
similarity index 100%
rename from Zend/tests/gh8548_2.phpt
rename to Zend/tests/streams/gh8548_2.phpt
diff --git a/Zend/tests/gh16371.phpt b/Zend/tests/weakrefs/gh16371.phpt
similarity index 100%
rename from Zend/tests/gh16371.phpt
rename to Zend/tests/weakrefs/gh16371.phpt
diff --git a/Zend/tests/gh18833.phpt b/Zend/tests/weakrefs/gh18833.phpt
similarity index 100%
rename from Zend/tests/gh18833.phpt
rename to Zend/tests/weakrefs/gh18833.phpt