diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/call_user_functions/bug32290.phpt
similarity index 100%
rename from Zend/tests/bug32290.phpt
rename to Zend/tests/call_user_functions/bug32290.phpt
diff --git a/Zend/tests/bug43426.phpt b/Zend/tests/call_user_functions/bug43426.phpt
similarity index 100%
rename from Zend/tests/bug43426.phpt
rename to Zend/tests/call_user_functions/bug43426.phpt
diff --git a/Zend/tests/bug66719.phpt b/Zend/tests/call_user_functions/bug66719.phpt
similarity index 100%
rename from Zend/tests/bug66719.phpt
rename to Zend/tests/call_user_functions/bug66719.phpt
diff --git a/Zend/tests/call_user_func_001.phpt b/Zend/tests/call_user_functions/call_user_func_001.phpt
similarity index 100%
rename from Zend/tests/call_user_func_001.phpt
rename to Zend/tests/call_user_functions/call_user_func_001.phpt
diff --git a/Zend/tests/call_user_func_002.phpt b/Zend/tests/call_user_functions/call_user_func_002.phpt
similarity index 100%
rename from Zend/tests/call_user_func_002.phpt
rename to Zend/tests/call_user_functions/call_user_func_002.phpt
diff --git a/Zend/tests/call_user_func_003.phpt b/Zend/tests/call_user_functions/call_user_func_003.phpt
similarity index 100%
rename from Zend/tests/call_user_func_003.phpt
rename to Zend/tests/call_user_functions/call_user_func_003.phpt
diff --git a/Zend/tests/call_user_func_005.phpt b/Zend/tests/call_user_functions/call_user_func_005.phpt
similarity index 100%
rename from Zend/tests/call_user_func_005.phpt
rename to Zend/tests/call_user_functions/call_user_func_005.phpt
diff --git a/Zend/tests/call_user_func_006.phpt b/Zend/tests/call_user_functions/call_user_func_006.phpt
similarity index 100%
rename from Zend/tests/call_user_func_006.phpt
rename to Zend/tests/call_user_functions/call_user_func_006.phpt
diff --git a/Zend/tests/call_user_func_007.phpt b/Zend/tests/call_user_functions/call_user_func_007.phpt
similarity index 100%
rename from Zend/tests/call_user_func_007.phpt
rename to Zend/tests/call_user_functions/call_user_func_007.phpt
diff --git a/Zend/tests/call_user_func_008.phpt b/Zend/tests/call_user_functions/call_user_func_008.phpt
similarity index 100%
rename from Zend/tests/call_user_func_008.phpt
rename to Zend/tests/call_user_functions/call_user_func_008.phpt
diff --git a/Zend/tests/call_user_func_009.phpt b/Zend/tests/call_user_functions/call_user_func_009.phpt
similarity index 100%
rename from Zend/tests/call_user_func_009.phpt
rename to Zend/tests/call_user_functions/call_user_func_009.phpt
diff --git a/Zend/tests/call_user_func_array_array_slice_named_args.phpt b/Zend/tests/call_user_functions/call_user_func_array_array_slice_named_args.phpt
similarity index 100%
rename from Zend/tests/call_user_func_array_array_slice_named_args.phpt
rename to Zend/tests/call_user_functions/call_user_func_array_array_slice_named_args.phpt
diff --git a/Zend/tests/call_user_func_array_array_slice_type.phpt b/Zend/tests/call_user_functions/call_user_func_array_array_slice_type.phpt
similarity index 100%
rename from Zend/tests/call_user_func_array_array_slice_type.phpt
rename to Zend/tests/call_user_functions/call_user_func_array_array_slice_type.phpt
diff --git a/Zend/tests/call_user_func_array_array_slice_type_strict.phpt b/Zend/tests/call_user_functions/call_user_func_array_array_slice_type_strict.phpt
similarity index 100%
rename from Zend/tests/call_user_func_array_array_slice_type_strict.phpt
rename to Zend/tests/call_user_functions/call_user_func_array_array_slice_type_strict.phpt
diff --git a/Zend/tests/call_user_func_array_invalid_type.phpt b/Zend/tests/call_user_functions/call_user_func_array_invalid_type.phpt
similarity index 100%
rename from Zend/tests/call_user_func_array_invalid_type.phpt
rename to Zend/tests/call_user_functions/call_user_func_array_invalid_type.phpt
diff --git a/Zend/tests/call_user_func_array_prefer_ref.phpt b/Zend/tests/call_user_functions/call_user_func_array_prefer_ref.phpt
similarity index 100%
rename from Zend/tests/call_user_func_array_prefer_ref.phpt
rename to Zend/tests/call_user_functions/call_user_func_array_prefer_ref.phpt
diff --git a/Zend/tests/call_user_func_by_ref.phpt b/Zend/tests/call_user_functions/call_user_func_by_ref.phpt
similarity index 100%
rename from Zend/tests/call_user_func_by_ref.phpt
rename to Zend/tests/call_user_functions/call_user_func_by_ref.phpt
diff --git a/Zend/tests/call_user_func_closure_from_static_method.phpt b/Zend/tests/call_user_functions/call_user_func_closure_from_static_method.phpt
similarity index 100%
rename from Zend/tests/call_user_func_closure_from_static_method.phpt
rename to Zend/tests/call_user_functions/call_user_func_closure_from_static_method.phpt
diff --git a/Zend/tests/call_user_func_strict_arginfo_check.phpt b/Zend/tests/call_user_functions/call_user_func_strict_arginfo_check.phpt
similarity index 100%
rename from Zend/tests/call_user_func_strict_arginfo_check.phpt
rename to Zend/tests/call_user_functions/call_user_func_strict_arginfo_check.phpt
diff --git a/Zend/tests/class_name_as_scalar.phpt b/Zend/tests/class_name/class_name_as_scalar.phpt
similarity index 100%
rename from Zend/tests/class_name_as_scalar.phpt
rename to Zend/tests/class_name/class_name_as_scalar.phpt
diff --git a/Zend/tests/class_name_as_scalar_error_001.phpt b/Zend/tests/class_name/class_name_as_scalar_error_001.phpt
similarity index 100%
rename from Zend/tests/class_name_as_scalar_error_001.phpt
rename to Zend/tests/class_name/class_name_as_scalar_error_001.phpt
diff --git a/Zend/tests/class_name_as_scalar_error_002.phpt b/Zend/tests/class_name/class_name_as_scalar_error_002.phpt
similarity index 100%
rename from Zend/tests/class_name_as_scalar_error_002.phpt
rename to Zend/tests/class_name/class_name_as_scalar_error_002.phpt
diff --git a/Zend/tests/class_name_as_scalar_error_003.phpt b/Zend/tests/class_name/class_name_as_scalar_error_003.phpt
similarity index 100%
rename from Zend/tests/class_name_as_scalar_error_003.phpt
rename to Zend/tests/class_name/class_name_as_scalar_error_003.phpt
diff --git a/Zend/tests/class_name_as_scalar_error_004.phpt b/Zend/tests/class_name/class_name_as_scalar_error_004.phpt
similarity index 100%
rename from Zend/tests/class_name_as_scalar_error_004.phpt
rename to Zend/tests/class_name/class_name_as_scalar_error_004.phpt
diff --git a/Zend/tests/class_name_as_scalar_error_005.phpt b/Zend/tests/class_name/class_name_as_scalar_error_005.phpt
similarity index 100%
rename from Zend/tests/class_name_as_scalar_error_005.phpt
rename to Zend/tests/class_name/class_name_as_scalar_error_005.phpt
diff --git a/Zend/tests/class_name_as_scalar_error_006.phpt b/Zend/tests/class_name/class_name_as_scalar_error_006.phpt
similarity index 100%
rename from Zend/tests/class_name_as_scalar_error_006.phpt
rename to Zend/tests/class_name/class_name_as_scalar_error_006.phpt
diff --git a/Zend/tests/class_name_as_scalar_error_007.phpt b/Zend/tests/class_name/class_name_as_scalar_error_007.phpt
similarity index 100%
rename from Zend/tests/class_name_as_scalar_error_007.phpt
rename to Zend/tests/class_name/class_name_as_scalar_error_007.phpt
diff --git a/Zend/tests/class_on_constant_evaluated_expression.phpt b/Zend/tests/class_name/class_on_constant_evaluated_expression.phpt
similarity index 100%
rename from Zend/tests/class_on_constant_evaluated_expression.phpt
rename to Zend/tests/class_name/class_on_constant_evaluated_expression.phpt
diff --git a/Zend/tests/class_on_object.phpt b/Zend/tests/class_name/class_on_object.phpt
similarity index 100%
rename from Zend/tests/class_on_object.phpt
rename to Zend/tests/class_name/class_on_object.phpt
diff --git a/Zend/tests/parent_class_name_without_parent.phpt b/Zend/tests/class_name/parent_class_name_without_parent.phpt
similarity index 100%
rename from Zend/tests/parent_class_name_without_parent.phpt
rename to Zend/tests/class_name/parent_class_name_without_parent.phpt
diff --git a/Zend/tests/self_class_const_in_unknown_scope.phpt b/Zend/tests/class_name/self_class_const_in_unknown_scope.phpt
similarity index 100%
rename from Zend/tests/self_class_const_in_unknown_scope.phpt
rename to Zend/tests/class_name/self_class_const_in_unknown_scope.phpt
diff --git a/Zend/tests/assign_coalesce_001.phpt b/Zend/tests/coalesce/assign_coalesce_001.phpt
similarity index 100%
rename from Zend/tests/assign_coalesce_001.phpt
rename to Zend/tests/coalesce/assign_coalesce_001.phpt
diff --git a/Zend/tests/assign_coalesce_002.phpt b/Zend/tests/coalesce/assign_coalesce_002.phpt
similarity index 100%
rename from Zend/tests/assign_coalesce_002.phpt
rename to Zend/tests/coalesce/assign_coalesce_002.phpt
diff --git a/Zend/tests/assign_coalesce_003.phpt b/Zend/tests/coalesce/assign_coalesce_003.phpt
similarity index 100%
rename from Zend/tests/assign_coalesce_003.phpt
rename to Zend/tests/coalesce/assign_coalesce_003.phpt
diff --git a/Zend/tests/assign_coalesce_004.phpt b/Zend/tests/coalesce/assign_coalesce_004.phpt
similarity index 100%
rename from Zend/tests/assign_coalesce_004.phpt
rename to Zend/tests/coalesce/assign_coalesce_004.phpt
diff --git a/Zend/tests/assign_coalesce_005.phpt b/Zend/tests/coalesce/assign_coalesce_005.phpt
similarity index 100%
rename from Zend/tests/assign_coalesce_005.phpt
rename to Zend/tests/coalesce/assign_coalesce_005.phpt
diff --git a/Zend/tests/assign_coalesce_006.phpt b/Zend/tests/coalesce/assign_coalesce_006.phpt
similarity index 100%
rename from Zend/tests/assign_coalesce_006.phpt
rename to Zend/tests/coalesce/assign_coalesce_006.phpt
diff --git a/Zend/tests/assign_coalesce_007.phpt b/Zend/tests/coalesce/assign_coalesce_007.phpt
similarity index 100%
rename from Zend/tests/assign_coalesce_007.phpt
rename to Zend/tests/coalesce/assign_coalesce_007.phpt
diff --git a/Zend/tests/assign_coalesce_008.phpt b/Zend/tests/coalesce/assign_coalesce_008.phpt
similarity index 100%
rename from Zend/tests/assign_coalesce_008.phpt
rename to Zend/tests/coalesce/assign_coalesce_008.phpt
diff --git a/Zend/tests/assign_coalesce_009.phpt b/Zend/tests/coalesce/assign_coalesce_009.phpt
similarity index 100%
rename from Zend/tests/assign_coalesce_009.phpt
rename to Zend/tests/coalesce/assign_coalesce_009.phpt
diff --git a/Zend/tests/bug69889.phpt b/Zend/tests/coalesce/bug69889.phpt
similarity index 100%
rename from Zend/tests/bug69889.phpt
rename to Zend/tests/coalesce/bug69889.phpt
diff --git a/Zend/tests/bug81684.phpt b/Zend/tests/coalesce/bug81684.phpt
similarity index 100%
rename from Zend/tests/bug81684.phpt
rename to Zend/tests/coalesce/bug81684.phpt
diff --git a/Zend/tests/coalesce_assign_optimization.phpt b/Zend/tests/coalesce/coalesce_assign_optimization.phpt
similarity index 100%
rename from Zend/tests/coalesce_assign_optimization.phpt
rename to Zend/tests/coalesce/coalesce_assign_optimization.phpt
diff --git a/Zend/tests/gh11108.phpt b/Zend/tests/coalesce/gh11108.phpt
similarity index 100%
rename from Zend/tests/gh11108.phpt
rename to Zend/tests/coalesce/gh11108.phpt
diff --git a/Zend/tests/gh11108_shutdown.inc b/Zend/tests/coalesce/gh11108_shutdown.inc
similarity index 100%
rename from Zend/tests/gh11108_shutdown.inc
rename to Zend/tests/coalesce/gh11108_shutdown.inc
diff --git a/Zend/tests/gh11108_test.inc b/Zend/tests/coalesce/gh11108_test.inc
similarity index 100%
rename from Zend/tests/gh11108_test.inc
rename to Zend/tests/coalesce/gh11108_test.inc
diff --git a/Zend/tests/assign_concat_array_empty_string.phpt b/Zend/tests/concat/assign_concat_array_empty_string.phpt
similarity index 100%
rename from Zend/tests/assign_concat_array_empty_string.phpt
rename to Zend/tests/concat/assign_concat_array_empty_string.phpt
diff --git a/Zend/tests/bug32833.phpt b/Zend/tests/concat/bug32833.phpt
similarity index 100%
rename from Zend/tests/bug32833.phpt
rename to Zend/tests/concat/bug32833.phpt
diff --git a/Zend/tests/bug40809.phpt b/Zend/tests/concat/bug40809.phpt
similarity index 100%
rename from Zend/tests/bug40809.phpt
rename to Zend/tests/concat/bug40809.phpt
diff --git a/Zend/tests/bug44069.phpt b/Zend/tests/concat/bug44069.phpt
similarity index 100%
rename from Zend/tests/bug44069.phpt
rename to Zend/tests/concat/bug44069.phpt
diff --git a/Zend/tests/bug68118.phpt b/Zend/tests/concat/bug68118.phpt
similarity index 100%
rename from Zend/tests/bug68118.phpt
rename to Zend/tests/concat/bug68118.phpt
diff --git a/Zend/tests/bug79836.phpt b/Zend/tests/concat/bug79836.phpt
similarity index 100%
rename from Zend/tests/bug79836.phpt
rename to Zend/tests/concat/bug79836.phpt
diff --git a/Zend/tests/bug79836_1.phpt b/Zend/tests/concat/bug79836_1.phpt
similarity index 100%
rename from Zend/tests/bug79836_1.phpt
rename to Zend/tests/concat/bug79836_1.phpt
diff --git a/Zend/tests/bug79836_2.phpt b/Zend/tests/concat/bug79836_2.phpt
similarity index 100%
rename from Zend/tests/bug79836_2.phpt
rename to Zend/tests/concat/bug79836_2.phpt
diff --git a/Zend/tests/bug79836_3.phpt b/Zend/tests/concat/bug79836_3.phpt
similarity index 100%
rename from Zend/tests/bug79836_3.phpt
rename to Zend/tests/concat/bug79836_3.phpt
diff --git a/Zend/tests/bug79836_4.phpt b/Zend/tests/concat/bug79836_4.phpt
similarity index 100%
rename from Zend/tests/bug79836_4.phpt
rename to Zend/tests/concat/bug79836_4.phpt
diff --git a/Zend/tests/bug81705.phpt b/Zend/tests/concat/bug81705.phpt
similarity index 100%
rename from Zend/tests/bug81705.phpt
rename to Zend/tests/concat/bug81705.phpt
diff --git a/Zend/tests/concat_001.phpt b/Zend/tests/concat/concat_001.phpt
similarity index 100%
rename from Zend/tests/concat_001.phpt
rename to Zend/tests/concat/concat_001.phpt
diff --git a/Zend/tests/concat_002.phpt b/Zend/tests/concat/concat_002.phpt
similarity index 100%
rename from Zend/tests/concat_002.phpt
rename to Zend/tests/concat/concat_002.phpt
diff --git a/Zend/tests/concat_003.phpt b/Zend/tests/concat/concat_003.phpt
similarity index 100%
rename from Zend/tests/concat_003.phpt
rename to Zend/tests/concat/concat_003.phpt
diff --git a/Zend/tests/bug76430.phpt b/Zend/tests/constants/bug76430.phpt
similarity index 100%
rename from Zend/tests/bug76430.phpt
rename to Zend/tests/constants/bug76430.phpt
diff --git a/Zend/tests/gh17222.phpt b/Zend/tests/constants/gh17222.phpt
similarity index 100%
rename from Zend/tests/gh17222.phpt
rename to Zend/tests/constants/gh17222.phpt
diff --git a/Zend/tests/oss_fuzz_57821.phpt b/Zend/tests/constants/oss_fuzz_57821.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_57821.phpt
rename to Zend/tests/constants/oss_fuzz_57821.phpt
diff --git a/Zend/tests/recursive_debug_info.phpt b/Zend/tests/debug_info/recursive_debug_info.phpt
similarity index 100%
rename from Zend/tests/recursive_debug_info.phpt
rename to Zend/tests/debug_info/recursive_debug_info.phpt
diff --git a/Zend/tests/gh14961.phpt b/Zend/tests/grammar/gh14961.phpt
similarity index 100%
rename from Zend/tests/gh14961.phpt
rename to Zend/tests/grammar/gh14961.phpt
diff --git a/Zend/tests/oss_fuzz_63802.phpt b/Zend/tests/in-de-crement/oss_fuzz_63802.phpt
similarity index 100%
rename from Zend/tests/oss_fuzz_63802.phpt
rename to Zend/tests/in-de-crement/oss_fuzz_63802.phpt
diff --git a/Zend/tests/post_inc_without_use.phpt b/Zend/tests/in-de-crement/post_inc_without_use.phpt
similarity index 100%
rename from Zend/tests/post_inc_without_use.phpt
rename to Zend/tests/in-de-crement/post_inc_without_use.phpt
diff --git a/Zend/tests/indirect_call_array_001.phpt b/Zend/tests/indirect_function_call/indirect_call_array_001.phpt
similarity index 100%
rename from Zend/tests/indirect_call_array_001.phpt
rename to Zend/tests/indirect_function_call/indirect_call_array_001.phpt
diff --git a/Zend/tests/indirect_call_array_002.phpt b/Zend/tests/indirect_function_call/indirect_call_array_002.phpt
similarity index 100%
rename from Zend/tests/indirect_call_array_002.phpt
rename to Zend/tests/indirect_function_call/indirect_call_array_002.phpt
diff --git a/Zend/tests/indirect_call_array_003.phpt b/Zend/tests/indirect_function_call/indirect_call_array_003.phpt
similarity index 100%
rename from Zend/tests/indirect_call_array_003.phpt
rename to Zend/tests/indirect_function_call/indirect_call_array_003.phpt
diff --git a/Zend/tests/indirect_call_array_004.phpt b/Zend/tests/indirect_function_call/indirect_call_array_004.phpt
similarity index 100%
rename from Zend/tests/indirect_call_array_004.phpt
rename to Zend/tests/indirect_function_call/indirect_call_array_004.phpt
diff --git a/Zend/tests/indirect_call_array_005.phpt b/Zend/tests/indirect_function_call/indirect_call_array_005.phpt
similarity index 100%
rename from Zend/tests/indirect_call_array_005.phpt
rename to Zend/tests/indirect_function_call/indirect_call_array_005.phpt
diff --git a/Zend/tests/indirect_call_from_constant.phpt b/Zend/tests/indirect_function_call/indirect_call_from_constant.phpt
similarity index 100%
rename from Zend/tests/indirect_call_from_constant.phpt
rename to Zend/tests/indirect_function_call/indirect_call_from_constant.phpt
diff --git a/Zend/tests/indirect_call_string_001.phpt b/Zend/tests/indirect_function_call/indirect_call_string_001.phpt
similarity index 100%
rename from Zend/tests/indirect_call_string_001.phpt
rename to Zend/tests/indirect_function_call/indirect_call_string_001.phpt
diff --git a/Zend/tests/indirect_call_string_002.phpt b/Zend/tests/indirect_function_call/indirect_call_string_002.phpt
similarity index 100%
rename from Zend/tests/indirect_call_string_002.phpt
rename to Zend/tests/indirect_function_call/indirect_call_string_002.phpt
diff --git a/Zend/tests/indirect_call_string_003.phpt b/Zend/tests/indirect_function_call/indirect_call_string_003.phpt
similarity index 100%
rename from Zend/tests/indirect_call_string_003.phpt
rename to Zend/tests/indirect_function_call/indirect_call_string_003.phpt
diff --git a/Zend/tests/indirect_method_call_001.phpt b/Zend/tests/indirect_function_call/indirect_method_call_001.phpt
similarity index 100%
rename from Zend/tests/indirect_method_call_001.phpt
rename to Zend/tests/indirect_function_call/indirect_method_call_001.phpt
diff --git a/Zend/tests/indirect_method_call_002.phpt b/Zend/tests/indirect_function_call/indirect_method_call_002.phpt
similarity index 100%
rename from Zend/tests/indirect_method_call_002.phpt
rename to Zend/tests/indirect_function_call/indirect_method_call_002.phpt
diff --git a/Zend/tests/indirect_method_call_003.phpt b/Zend/tests/indirect_function_call/indirect_method_call_003.phpt
similarity index 100%
rename from Zend/tests/indirect_method_call_003.phpt
rename to Zend/tests/indirect_function_call/indirect_method_call_003.phpt
diff --git a/Zend/tests/indirect_method_call_004.phpt b/Zend/tests/indirect_function_call/indirect_method_call_004.phpt
similarity index 100%
rename from Zend/tests/indirect_method_call_004.phpt
rename to Zend/tests/indirect_function_call/indirect_method_call_004.phpt
diff --git a/Zend/tests/indirect_method_call_005.phpt b/Zend/tests/indirect_function_call/indirect_method_call_005.phpt
similarity index 100%
rename from Zend/tests/indirect_method_call_005.phpt
rename to Zend/tests/indirect_function_call/indirect_method_call_005.phpt
diff --git a/Zend/tests/bug81631.phpt b/Zend/tests/line_numbers/bug81631.phpt
similarity index 100%
rename from Zend/tests/bug81631.phpt
rename to Zend/tests/line_numbers/bug81631.phpt
diff --git a/Zend/tests/gh16509.inc b/Zend/tests/line_numbers/gh16509.inc
similarity index 100%
rename from Zend/tests/gh16509.inc
rename to Zend/tests/line_numbers/gh16509.inc
diff --git a/Zend/tests/gh16509.phpt b/Zend/tests/line_numbers/gh16509.phpt
similarity index 100%
rename from Zend/tests/gh16509.phpt
rename to Zend/tests/line_numbers/gh16509.phpt
diff --git a/Zend/tests/gh8810_1.phpt b/Zend/tests/line_numbers/gh8810_1.phpt
similarity index 100%
rename from Zend/tests/gh8810_1.phpt
rename to Zend/tests/line_numbers/gh8810_1.phpt
diff --git a/Zend/tests/gh8810_2.phpt b/Zend/tests/line_numbers/gh8810_2.phpt
similarity index 100%
rename from Zend/tests/gh8810_2.phpt
rename to Zend/tests/line_numbers/gh8810_2.phpt
diff --git a/Zend/tests/gh8810_3.phpt b/Zend/tests/line_numbers/gh8810_3.phpt
similarity index 100%
rename from Zend/tests/gh8810_3.phpt
rename to Zend/tests/line_numbers/gh8810_3.phpt
diff --git a/Zend/tests/gh8810_4.phpt b/Zend/tests/line_numbers/gh8810_4.phpt
similarity index 100%
rename from Zend/tests/gh8810_4.phpt
rename to Zend/tests/line_numbers/gh8810_4.phpt
diff --git a/Zend/tests/gh8810_5.phpt b/Zend/tests/line_numbers/gh8810_5.phpt
similarity index 100%
rename from Zend/tests/gh8810_5.phpt
rename to Zend/tests/line_numbers/gh8810_5.phpt
diff --git a/Zend/tests/gh8810_6.phpt b/Zend/tests/line_numbers/gh8810_6.phpt
similarity index 100%
rename from Zend/tests/gh8810_6.phpt
rename to Zend/tests/line_numbers/gh8810_6.phpt
diff --git a/Zend/tests/gh8810_7.phpt b/Zend/tests/line_numbers/gh8810_7.phpt
similarity index 100%
rename from Zend/tests/gh8810_7.phpt
rename to Zend/tests/line_numbers/gh8810_7.phpt
diff --git a/Zend/tests/gh8821.phpt b/Zend/tests/line_numbers/gh8821.phpt
similarity index 100%
rename from Zend/tests/gh8821.phpt
rename to Zend/tests/line_numbers/gh8821.phpt
diff --git a/Zend/tests/overloaded_prop_assign_op_refs.phpt b/Zend/tests/magic_methods/overloaded_prop_assign_op_refs.phpt
similarity index 100%
rename from Zend/tests/overloaded_prop_assign_op_refs.phpt
rename to Zend/tests/magic_methods/overloaded_prop_assign_op_refs.phpt
diff --git a/Zend/tests/trampoline_closure_named_arguments.phpt b/Zend/tests/magic_methods/trampoline_closure_named_arguments.phpt
similarity index 100%
rename from Zend/tests/trampoline_closure_named_arguments.phpt
rename to Zend/tests/magic_methods/trampoline_closure_named_arguments.phpt
diff --git a/Zend/tests/serializable_deprecation.phpt b/Zend/tests/serialize/serializable_deprecation.phpt
similarity index 100%
rename from Zend/tests/serializable_deprecation.phpt
rename to Zend/tests/serialize/serializable_deprecation.phpt
diff --git a/Zend/tests/static_variable.phpt b/Zend/tests/static_variables/static_variable.phpt
similarity index 100%
rename from Zend/tests/static_variable.phpt
rename to Zend/tests/static_variables/static_variable.phpt
diff --git a/Zend/tests/static_variable_func_call.phpt b/Zend/tests/static_variables/static_variable_func_call.phpt
similarity index 100%
rename from Zend/tests/static_variable_func_call.phpt
rename to Zend/tests/static_variables/static_variable_func_call.phpt
diff --git a/Zend/tests/static_variable_in_dynamic_function.phpt b/Zend/tests/static_variables/static_variable_in_dynamic_function.phpt
similarity index 100%
rename from Zend/tests/static_variable_in_dynamic_function.phpt
rename to Zend/tests/static_variables/static_variable_in_dynamic_function.phpt
diff --git a/Zend/tests/static_variable_in_dynamic_function_2.phpt b/Zend/tests/static_variables/static_variable_in_dynamic_function_2.phpt
similarity index 100%
rename from Zend/tests/static_variable_in_dynamic_function_2.phpt
rename to Zend/tests/static_variables/static_variable_in_dynamic_function_2.phpt
diff --git a/Zend/tests/static_variable_in_private_method.phpt b/Zend/tests/static_variables/static_variable_in_private_method.phpt
similarity index 100%
rename from Zend/tests/static_variable_in_private_method.phpt
rename to Zend/tests/static_variables/static_variable_in_private_method.phpt
diff --git a/Zend/tests/static_variable_in_private_trait_method.phpt b/Zend/tests/static_variables/static_variable_in_private_trait_method.phpt
similarity index 100%
rename from Zend/tests/static_variable_in_private_trait_method.phpt
rename to Zend/tests/static_variables/static_variable_in_private_trait_method.phpt
diff --git a/Zend/tests/static_variables_closure_bind.phpt b/Zend/tests/static_variables/static_variables_closure_bind.phpt
similarity index 100%
rename from Zend/tests/static_variables_closure_bind.phpt
rename to Zend/tests/static_variables/static_variables_closure_bind.phpt
diff --git a/Zend/tests/static_variables_destructor.phpt b/Zend/tests/static_variables/static_variables_destructor.phpt
similarity index 100%
rename from Zend/tests/static_variables_destructor.phpt
rename to Zend/tests/static_variables/static_variables_destructor.phpt
diff --git a/Zend/tests/static_variables_global.phpt b/Zend/tests/static_variables/static_variables_global.phpt
similarity index 100%
rename from Zend/tests/static_variables_global.phpt
rename to Zend/tests/static_variables/static_variables_global.phpt
diff --git a/Zend/tests/static_variables_global_2.phpt b/Zend/tests/static_variables/static_variables_global_2.phpt
similarity index 100%
rename from Zend/tests/static_variables_global_2.phpt
rename to Zend/tests/static_variables/static_variables_global_2.phpt
diff --git a/Zend/tests/static_variables_recursive.phpt b/Zend/tests/static_variables/static_variables_recursive.phpt
similarity index 100%
rename from Zend/tests/static_variables_recursive.phpt
rename to Zend/tests/static_variables/static_variables_recursive.phpt
diff --git a/Zend/tests/static_variables_throwing_initializer.phpt b/Zend/tests/static_variables/static_variables_throwing_initializer.phpt
similarity index 100%
rename from Zend/tests/static_variables_throwing_initializer.phpt
rename to Zend/tests/static_variables/static_variables_throwing_initializer.phpt
diff --git a/Zend/tests/static_variables_traits.phpt b/Zend/tests/static_variables/static_variables_traits.phpt
similarity index 100%
rename from Zend/tests/static_variables_traits.phpt
rename to Zend/tests/static_variables/static_variables_traits.phpt
diff --git a/Zend/tests/class_uses_static.phpt b/Zend/tests/traits/class_uses_static.phpt
similarity index 100%
rename from Zend/tests/class_uses_static.phpt
rename to Zend/tests/traits/class_uses_static.phpt
diff --git a/Zend/tests/cast_to_array.phpt b/Zend/tests/type_casts/cast_to_array.phpt
similarity index 100%
rename from Zend/tests/cast_to_array.phpt
rename to Zend/tests/type_casts/cast_to_array.phpt
diff --git a/Zend/tests/cast_to_bool.phpt b/Zend/tests/type_casts/cast_to_bool.phpt
similarity index 100%
rename from Zend/tests/cast_to_bool.phpt
rename to Zend/tests/type_casts/cast_to_bool.phpt
diff --git a/Zend/tests/cast_to_double.phpt b/Zend/tests/type_casts/cast_to_double.phpt
similarity index 100%
rename from Zend/tests/cast_to_double.phpt
rename to Zend/tests/type_casts/cast_to_double.phpt
diff --git a/Zend/tests/cast_to_int.phpt b/Zend/tests/type_casts/cast_to_int.phpt
similarity index 100%
rename from Zend/tests/cast_to_int.phpt
rename to Zend/tests/type_casts/cast_to_int.phpt
diff --git a/Zend/tests/cast_to_object.phpt b/Zend/tests/type_casts/cast_to_object.phpt
similarity index 100%
rename from Zend/tests/cast_to_object.phpt
rename to Zend/tests/type_casts/cast_to_object.phpt
diff --git a/Zend/tests/cast_to_string.phpt b/Zend/tests/type_casts/cast_to_string.phpt
similarity index 100%
rename from Zend/tests/cast_to_string.phpt
rename to Zend/tests/type_casts/cast_to_string.phpt
diff --git a/Zend/tests/real_cast.phpt b/Zend/tests/type_casts/real_cast.phpt
similarity index 100%
rename from Zend/tests/real_cast.phpt
rename to Zend/tests/type_casts/real_cast.phpt