diff --git a/Zend/tests/bug28377.phpt b/Zend/tests/backtrace/bug28377.phpt
similarity index 100%
rename from Zend/tests/bug28377.phpt
rename to Zend/tests/backtrace/bug28377.phpt
diff --git a/Zend/tests/bug30828.phpt b/Zend/tests/backtrace/bug30828.phpt
similarity index 100%
rename from Zend/tests/bug30828.phpt
rename to Zend/tests/backtrace/bug30828.phpt
diff --git a/Zend/tests/bug39445.phpt b/Zend/tests/backtrace/bug39445.phpt
similarity index 100%
rename from Zend/tests/bug39445.phpt
rename to Zend/tests/backtrace/bug39445.phpt
diff --git a/Zend/tests/bug64239_2.phpt b/Zend/tests/backtrace/bug64239_2.phpt
similarity index 100%
rename from Zend/tests/bug64239_2.phpt
rename to Zend/tests/backtrace/bug64239_2.phpt
diff --git a/Zend/tests/bug64239_3.phpt b/Zend/tests/backtrace/bug64239_3.phpt
similarity index 100%
rename from Zend/tests/bug64239_3.phpt
rename to Zend/tests/backtrace/bug64239_3.phpt
diff --git a/Zend/tests/bug64239_4.phpt b/Zend/tests/backtrace/bug64239_4.phpt
similarity index 100%
rename from Zend/tests/bug64239_4.phpt
rename to Zend/tests/backtrace/bug64239_4.phpt
diff --git a/Zend/tests/bug69180-backtrace.phpt b/Zend/tests/backtrace/bug69180-backtrace.phpt
similarity index 100%
rename from Zend/tests/bug69180-backtrace.phpt
rename to Zend/tests/backtrace/bug69180-backtrace.phpt
diff --git a/Zend/tests/bug70547.phpt b/Zend/tests/backtrace/bug70547.phpt
similarity index 100%
rename from Zend/tests/bug70547.phpt
rename to Zend/tests/backtrace/bug70547.phpt
diff --git a/Zend/tests/bug76047.phpt b/Zend/tests/backtrace/bug76047.phpt
similarity index 100%
rename from Zend/tests/bug76047.phpt
rename to Zend/tests/backtrace/bug76047.phpt
diff --git a/Zend/tests/bug79108.phpt b/Zend/tests/backtrace/bug79108.phpt
similarity index 100%
rename from Zend/tests/bug79108.phpt
rename to Zend/tests/backtrace/bug79108.phpt
diff --git a/Zend/tests/bug_debug_backtrace.phpt b/Zend/tests/backtrace/bug_debug_backtrace.phpt
similarity index 100%
rename from Zend/tests/bug_debug_backtrace.phpt
rename to Zend/tests/backtrace/bug_debug_backtrace.phpt
diff --git a/Zend/tests/bug_debug_backtrace_replace_zend_execute_ex.phpt b/Zend/tests/backtrace/bug_debug_backtrace_replace_zend_execute_ex.phpt
similarity index 100%
rename from Zend/tests/bug_debug_backtrace_replace_zend_execute_ex.phpt
rename to Zend/tests/backtrace/bug_debug_backtrace_replace_zend_execute_ex.phpt
diff --git a/Zend/tests/debug_backtrace_limit.phpt b/Zend/tests/backtrace/debug_backtrace_limit.phpt
similarity index 100%
rename from Zend/tests/debug_backtrace_limit.phpt
rename to Zend/tests/backtrace/debug_backtrace_limit.phpt
diff --git a/Zend/tests/debug_backtrace_options.phpt b/Zend/tests/backtrace/debug_backtrace_options.phpt
similarity index 100%
rename from Zend/tests/debug_backtrace_options.phpt
rename to Zend/tests/backtrace/debug_backtrace_options.phpt
diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/backtrace/debug_backtrace_with_include_and_this.phpt
similarity index 100%
rename from Zend/tests/debug_backtrace_with_include_and_this.phpt
rename to Zend/tests/backtrace/debug_backtrace_with_include_and_this.phpt
diff --git a/Zend/tests/debug_print_backtrace_from_main.phpt b/Zend/tests/backtrace/debug_print_backtrace_from_main.phpt
similarity index 100%
rename from Zend/tests/debug_print_backtrace_from_main.phpt
rename to Zend/tests/backtrace/debug_print_backtrace_from_main.phpt
diff --git a/Zend/tests/debug_print_backtrace_limit.phpt b/Zend/tests/backtrace/debug_print_backtrace_limit.phpt
similarity index 100%
rename from Zend/tests/debug_print_backtrace_limit.phpt
rename to Zend/tests/backtrace/debug_print_backtrace_limit.phpt
diff --git a/Zend/tests/fatal_error_backtraces_001.phpt b/Zend/tests/backtrace/fatal_error_backtraces_001.phpt
similarity index 100%
rename from Zend/tests/fatal_error_backtraces_001.phpt
rename to Zend/tests/backtrace/fatal_error_backtraces_001.phpt
diff --git a/Zend/tests/fatal_error_backtraces_002.phpt b/Zend/tests/backtrace/fatal_error_backtraces_002.phpt
similarity index 100%
rename from Zend/tests/fatal_error_backtraces_002.phpt
rename to Zend/tests/backtrace/fatal_error_backtraces_002.phpt
diff --git a/Zend/tests/fatal_error_backtraces_003.phpt b/Zend/tests/backtrace/fatal_error_backtraces_003.phpt
similarity index 100%
rename from Zend/tests/fatal_error_backtraces_003.phpt
rename to Zend/tests/backtrace/fatal_error_backtraces_003.phpt
diff --git a/Zend/tests/008.phpt b/Zend/tests/constants/008.phpt
similarity index 100%
rename from Zend/tests/008.phpt
rename to Zend/tests/constants/008.phpt
diff --git a/Zend/tests/018.phpt b/Zend/tests/constants/018.phpt
similarity index 100%
rename from Zend/tests/018.phpt
rename to Zend/tests/constants/018.phpt
diff --git a/Zend/tests/bug42820.phpt b/Zend/tests/constants/bug42820.phpt
similarity index 100%
rename from Zend/tests/bug42820.phpt
rename to Zend/tests/constants/bug42820.phpt
diff --git a/Zend/tests/const_deprecation.phpt b/Zend/tests/constants/const_deprecation.phpt
similarity index 100%
rename from Zend/tests/const_deprecation.phpt
rename to Zend/tests/constants/const_deprecation.phpt
diff --git a/Zend/tests/defined_fn_no_ns_fallback.phpt b/Zend/tests/constants/defined_fn_no_ns_fallback.phpt
similarity index 100%
rename from Zend/tests/defined_fn_no_ns_fallback.phpt
rename to Zend/tests/constants/defined_fn_no_ns_fallback.phpt
diff --git a/Zend/tests/selfParent_001.phpt b/Zend/tests/constants/selfParent_001.phpt
similarity index 100%
rename from Zend/tests/selfParent_001.phpt
rename to Zend/tests/constants/selfParent_001.phpt
diff --git a/Zend/tests/selfParent_002.phpt b/Zend/tests/constants/selfParent_002.phpt
similarity index 100%
rename from Zend/tests/selfParent_002.phpt
rename to Zend/tests/constants/selfParent_002.phpt
diff --git a/Zend/tests/const_expr_dim_on_null_warning.phpt b/Zend/tests/constexpr/const_expr_dim_on_null_warning.phpt
similarity index 100%
rename from Zend/tests/const_expr_dim_on_null_warning.phpt
rename to Zend/tests/constexpr/const_expr_dim_on_null_warning.phpt
diff --git a/Zend/tests/enum_in_stack_trace.phpt b/Zend/tests/enum/enum_in_stack_trace.phpt
similarity index 100%
rename from Zend/tests/enum_in_stack_trace.phpt
rename to Zend/tests/enum/enum_in_stack_trace.phpt
diff --git a/Zend/tests/bug30519.phpt b/Zend/tests/errmsg/bug30519.phpt
similarity index 100%
rename from Zend/tests/bug30519.phpt
rename to Zend/tests/errmsg/bug30519.phpt
diff --git a/Zend/tests/bug54043.phpt b/Zend/tests/exceptions/bug54043.phpt
similarity index 100%
rename from Zend/tests/bug54043.phpt
rename to Zend/tests/exceptions/bug54043.phpt
diff --git a/Zend/tests/function_default_argument_cache.phpt b/Zend/tests/function_arguments/function_default_argument_cache.phpt
similarity index 100%
rename from Zend/tests/function_default_argument_cache.phpt
rename to Zend/tests/function_arguments/function_default_argument_cache.phpt
diff --git a/Zend/tests/alternative_offset_syntax_compile_error_in_const_expr.phpt b/Zend/tests/grammar/alternative_offset_syntax_compile_error_in_const_expr.phpt
similarity index 100%
rename from Zend/tests/alternative_offset_syntax_compile_error_in_const_expr.phpt
rename to Zend/tests/grammar/alternative_offset_syntax_compile_error_in_const_expr.phpt
diff --git a/Zend/tests/alternative_offset_syntax_compile_error_outside_const_expr.phpt b/Zend/tests/grammar/alternative_offset_syntax_compile_error_outside_const_expr.phpt
similarity index 100%
rename from Zend/tests/alternative_offset_syntax_compile_error_outside_const_expr.phpt
rename to Zend/tests/grammar/alternative_offset_syntax_compile_error_outside_const_expr.phpt
diff --git a/Zend/tests/alternative_offset_syntax_in_encaps_string.phpt b/Zend/tests/grammar/alternative_offset_syntax_in_encaps_string.phpt
similarity index 100%
rename from Zend/tests/alternative_offset_syntax_in_encaps_string.phpt
rename to Zend/tests/grammar/alternative_offset_syntax_in_encaps_string.phpt
diff --git a/Zend/tests/bug31341.phpt b/Zend/tests/grammar/bug31341.phpt
similarity index 100%
rename from Zend/tests/bug31341.phpt
rename to Zend/tests/grammar/bug31341.phpt
diff --git a/Zend/tests/bug35411.phpt b/Zend/tests/grammar/bug35411.phpt
similarity index 100%
rename from Zend/tests/bug35411.phpt
rename to Zend/tests/grammar/bug35411.phpt
diff --git a/Zend/tests/bug41401.phpt b/Zend/tests/grammar/bug41401.phpt
similarity index 100%
rename from Zend/tests/bug41401.phpt
rename to Zend/tests/grammar/bug41401.phpt
diff --git a/Zend/tests/bug45147.phpt b/Zend/tests/grammar/bug45147.phpt
similarity index 100%
rename from Zend/tests/bug45147.phpt
rename to Zend/tests/grammar/bug45147.phpt
diff --git a/Zend/tests/bug55445.phpt b/Zend/tests/grammar/bug55445.phpt
similarity index 100%
rename from Zend/tests/bug55445.phpt
rename to Zend/tests/grammar/bug55445.phpt
diff --git a/Zend/tests/bug60099.phpt b/Zend/tests/grammar/bug60099.phpt
similarity index 100%
rename from Zend/tests/bug60099.phpt
rename to Zend/tests/grammar/bug60099.phpt
diff --git a/Zend/tests/bug61095.phpt b/Zend/tests/grammar/bug61095.phpt
similarity index 100%
rename from Zend/tests/bug61095.phpt
rename to Zend/tests/grammar/bug61095.phpt
diff --git a/Zend/tests/bug61225.phpt b/Zend/tests/grammar/bug61225.phpt
similarity index 100%
rename from Zend/tests/bug61225.phpt
rename to Zend/tests/grammar/bug61225.phpt
diff --git a/Zend/tests/bug61681.phpt b/Zend/tests/grammar/bug61681.phpt
similarity index 100%
rename from Zend/tests/bug61681.phpt
rename to Zend/tests/grammar/bug61681.phpt
diff --git a/Zend/tests/bug70430.phpt b/Zend/tests/grammar/bug70430.phpt
similarity index 100%
rename from Zend/tests/bug70430.phpt
rename to Zend/tests/grammar/bug70430.phpt
diff --git a/Zend/tests/bug77993.phpt b/Zend/tests/grammar/bug77993.phpt
similarity index 100%
rename from Zend/tests/bug77993.phpt
rename to Zend/tests/grammar/bug77993.phpt
diff --git a/Zend/tests/readonly_function.phpt b/Zend/tests/grammar/readonly_function.phpt
similarity index 100%
rename from Zend/tests/readonly_function.phpt
rename to Zend/tests/grammar/readonly_function.phpt
diff --git a/Zend/tests/bug76439.phpt b/Zend/tests/heredoc_nowdoc/bug76439.phpt
similarity index 100%
rename from Zend/tests/bug76439.phpt
rename to Zend/tests/heredoc_nowdoc/bug76439.phpt
diff --git a/Zend/tests/bug76439_2.phpt b/Zend/tests/heredoc_nowdoc/bug76439_2.phpt
similarity index 100%
rename from Zend/tests/bug76439_2.phpt
rename to Zend/tests/heredoc_nowdoc/bug76439_2.phpt
diff --git a/Zend/tests/warning_during_heredoc_scan_ahead.phpt b/Zend/tests/heredoc_nowdoc/warning_during_heredoc_scan_ahead.phpt
similarity index 100%
rename from Zend/tests/warning_during_heredoc_scan_ahead.phpt
rename to Zend/tests/heredoc_nowdoc/warning_during_heredoc_scan_ahead.phpt
diff --git a/Zend/tests/deprecation_to_exception_during_inheritance.phpt b/Zend/tests/inheritance/deprecation_to_exception_during_inheritance.phpt
similarity index 100%
rename from Zend/tests/deprecation_to_exception_during_inheritance.phpt
rename to Zend/tests/inheritance/deprecation_to_exception_during_inheritance.phpt
diff --git a/Zend/tests/bug28444.phpt b/Zend/tests/magic_methods/bug28444.phpt
similarity index 100%
rename from Zend/tests/bug28444.phpt
rename to Zend/tests/magic_methods/bug28444.phpt
diff --git a/Zend/tests/bug34893.phpt b/Zend/tests/magic_methods/bug34893.phpt
similarity index 100%
rename from Zend/tests/bug34893.phpt
rename to Zend/tests/magic_methods/bug34893.phpt
diff --git a/Zend/tests/bug39449.phpt b/Zend/tests/magic_methods/bug39449.phpt
similarity index 100%
rename from Zend/tests/bug39449.phpt
rename to Zend/tests/magic_methods/bug39449.phpt
diff --git a/Zend/tests/bug39775.phpt b/Zend/tests/magic_methods/bug39775.phpt
similarity index 100%
rename from Zend/tests/bug39775.phpt
rename to Zend/tests/magic_methods/bug39775.phpt
diff --git a/Zend/tests/bug71359.phpt b/Zend/tests/magic_methods/bug71359.phpt
similarity index 100%
rename from Zend/tests/bug71359.phpt
rename to Zend/tests/magic_methods/bug71359.phpt
diff --git a/Zend/tests/call_static.phpt b/Zend/tests/magic_methods/call_static.phpt
similarity index 100%
rename from Zend/tests/call_static.phpt
rename to Zend/tests/magic_methods/call_static.phpt
diff --git a/Zend/tests/call_static_002.phpt b/Zend/tests/magic_methods/call_static_002.phpt
similarity index 100%
rename from Zend/tests/call_static_002.phpt
rename to Zend/tests/magic_methods/call_static_002.phpt
diff --git a/Zend/tests/call_static_003.phpt b/Zend/tests/magic_methods/call_static_003.phpt
similarity index 100%
rename from Zend/tests/call_static_003.phpt
rename to Zend/tests/magic_methods/call_static_003.phpt
diff --git a/Zend/tests/call_static_004.phpt b/Zend/tests/magic_methods/call_static_004.phpt
similarity index 100%
rename from Zend/tests/call_static_004.phpt
rename to Zend/tests/magic_methods/call_static_004.phpt
diff --git a/Zend/tests/call_static_006.phpt b/Zend/tests/magic_methods/call_static_006.phpt
similarity index 100%
rename from Zend/tests/call_static_006.phpt
rename to Zend/tests/magic_methods/call_static_006.phpt
diff --git a/Zend/tests/call_static_007.phpt b/Zend/tests/magic_methods/call_static_007.phpt
similarity index 100%
rename from Zend/tests/call_static_007.phpt
rename to Zend/tests/magic_methods/call_static_007.phpt
diff --git a/Zend/tests/stringable_automatic_implementation.phpt b/Zend/tests/magic_methods/stringable_automatic_implementation.phpt
similarity index 100%
rename from Zend/tests/stringable_automatic_implementation.phpt
rename to Zend/tests/magic_methods/stringable_automatic_implementation.phpt
diff --git a/Zend/tests/stringable_internal_class.phpt b/Zend/tests/magic_methods/stringable_internal_class.phpt
similarity index 100%
rename from Zend/tests/stringable_internal_class.phpt
rename to Zend/tests/magic_methods/stringable_internal_class.phpt
diff --git a/Zend/tests/stringable_trait.phpt b/Zend/tests/magic_methods/stringable_trait.phpt
similarity index 100%
rename from Zend/tests/stringable_trait.phpt
rename to Zend/tests/magic_methods/stringable_trait.phpt
diff --git a/Zend/tests/stringable_trait_invalid.phpt b/Zend/tests/magic_methods/stringable_trait_invalid.phpt
similarity index 100%
rename from Zend/tests/stringable_trait_invalid.phpt
rename to Zend/tests/magic_methods/stringable_trait_invalid.phpt
diff --git a/Zend/tests/oss-fuzz-69765.phpt b/Zend/tests/nullsafe_operator/oss-fuzz-69765.phpt
similarity index 100%
rename from Zend/tests/oss-fuzz-69765.phpt
rename to Zend/tests/nullsafe_operator/oss-fuzz-69765.phpt
diff --git a/Zend/tests/oss_fuzz_60011_1.phpt b/Zend/tests/nullsafe_operator/oss_fuzz_60011_1.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_60011_1.phpt
rename to Zend/tests/nullsafe_operator/oss_fuzz_60011_1.phpt
diff --git a/Zend/tests/oss_fuzz_60011_2.phpt b/Zend/tests/nullsafe_operator/oss_fuzz_60011_2.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_60011_2.phpt
rename to Zend/tests/nullsafe_operator/oss_fuzz_60011_2.phpt
diff --git a/Zend/tests/oss-fuzz-391975641.phpt b/Zend/tests/property_hooks/oss-fuzz-391975641.phpt
similarity index 100%
rename from Zend/tests/oss-fuzz-391975641.phpt
rename to Zend/tests/property_hooks/oss-fuzz-391975641.phpt
diff --git a/Zend/tests/034.phpt b/Zend/tests/switch/034.phpt
similarity index 100%
rename from Zend/tests/034.phpt
rename to Zend/tests/switch/034.phpt
diff --git a/Zend/tests/bug80046.phpt b/Zend/tests/switch/bug80046.phpt
similarity index 100%
rename from Zend/tests/bug80046.phpt
rename to Zend/tests/switch/bug80046.phpt
diff --git a/Zend/tests/switch_on_numeric_strings.phpt b/Zend/tests/switch/switch_on_numeric_strings.phpt
similarity index 100%
rename from Zend/tests/switch_on_numeric_strings.phpt
rename to Zend/tests/switch/switch_on_numeric_strings.phpt
diff --git a/Zend/tests/030.phpt b/Zend/tests/this-reserved/030.phpt
similarity index 100%
rename from Zend/tests/030.phpt
rename to Zend/tests/this-reserved/030.phpt
diff --git a/Zend/tests/bug34358.phpt b/Zend/tests/this-reserved/bug34358.phpt
similarity index 100%
rename from Zend/tests/bug34358.phpt
rename to Zend/tests/this-reserved/bug34358.phpt
diff --git a/Zend/tests/bug41117_1.phpt b/Zend/tests/this-reserved/bug41117_1.phpt
similarity index 100%
rename from Zend/tests/bug41117_1.phpt
rename to Zend/tests/this-reserved/bug41117_1.phpt
diff --git a/Zend/tests/bug71737.phpt b/Zend/tests/this-reserved/bug71737.phpt
similarity index 100%
rename from Zend/tests/bug71737.phpt
rename to Zend/tests/this-reserved/bug71737.phpt
diff --git a/Zend/tests/this_as_global.phpt b/Zend/tests/this-reserved/this_as_global.phpt
similarity index 100%
rename from Zend/tests/this_as_global.phpt
rename to Zend/tests/this-reserved/this_as_global.phpt
diff --git a/Zend/tests/this_as_lexical_var_error.phpt b/Zend/tests/this-reserved/this_as_lexical_var_error.phpt
similarity index 100%
rename from Zend/tests/this_as_lexical_var_error.phpt
rename to Zend/tests/this-reserved/this_as_lexical_var_error.phpt
diff --git a/Zend/tests/this_as_parameter.phpt b/Zend/tests/this-reserved/this_as_parameter.phpt
similarity index 100%
rename from Zend/tests/this_as_parameter.phpt
rename to Zend/tests/this-reserved/this_as_parameter.phpt
diff --git a/Zend/tests/this_as_static.phpt b/Zend/tests/this-reserved/this_as_static.phpt
similarity index 100%
rename from Zend/tests/this_as_static.phpt
rename to Zend/tests/this-reserved/this_as_static.phpt
diff --git a/Zend/tests/this_in_catch.phpt b/Zend/tests/this-reserved/this_in_catch.phpt
similarity index 100%
rename from Zend/tests/this_in_catch.phpt
rename to Zend/tests/this-reserved/this_in_catch.phpt
diff --git a/Zend/tests/this_in_extract.phpt b/Zend/tests/this-reserved/this_in_extract.phpt
similarity index 100%
rename from Zend/tests/this_in_extract.phpt
rename to Zend/tests/this-reserved/this_in_extract.phpt
diff --git a/Zend/tests/this_reassign.phpt b/Zend/tests/this-reserved/this_reassign.phpt
similarity index 100%
rename from Zend/tests/this_reassign.phpt
rename to Zend/tests/this-reserved/this_reassign.phpt