diff --git a/Zend/tests/array_add_indirect.phpt b/Zend/tests/arrays/array_add_indirect.phpt
similarity index 100%
rename from Zend/tests/array_add_indirect.phpt
rename to Zend/tests/arrays/array_add_indirect.phpt
diff --git a/Zend/tests/array_addition_not_commutative.phpt b/Zend/tests/arrays/array_addition_not_commutative.phpt
similarity index 100%
rename from Zend/tests/array_addition_not_commutative.phpt
rename to Zend/tests/arrays/array_addition_not_commutative.phpt
diff --git a/Zend/tests/array_append_COW.phpt b/Zend/tests/arrays/array_append_COW.phpt
similarity index 100%
rename from Zend/tests/array_append_COW.phpt
rename to Zend/tests/arrays/array_append_COW.phpt
diff --git a/Zend/tests/array_append_by_reference.phpt b/Zend/tests/arrays/array_append_by_reference.phpt
similarity index 100%
rename from Zend/tests/array_append_by_reference.phpt
rename to Zend/tests/arrays/array_append_by_reference.phpt
diff --git a/Zend/tests/array_append_reading_error.phpt b/Zend/tests/arrays/array_append_reading_error.phpt
similarity index 100%
rename from Zend/tests/array_append_reading_error.phpt
rename to Zend/tests/arrays/array_append_reading_error.phpt
diff --git a/Zend/tests/array_hash_zero.phpt b/Zend/tests/arrays/array_hash_zero.phpt
similarity index 100%
rename from Zend/tests/array_hash_zero.phpt
rename to Zend/tests/arrays/array_hash_zero.phpt
diff --git a/Zend/tests/array_literal_next_element_error.phpt b/Zend/tests/arrays/array_literal_next_element_error.phpt
similarity index 100%
rename from Zend/tests/array_literal_next_element_error.phpt
rename to Zend/tests/arrays/array_literal_next_element_error.phpt
diff --git a/Zend/tests/array_merge_recursive_next_key_overflow.phpt b/Zend/tests/arrays/array_merge_recursive_next_key_overflow.phpt
similarity index 100%
rename from Zend/tests/array_merge_recursive_next_key_overflow.phpt
rename to Zend/tests/arrays/array_merge_recursive_next_key_overflow.phpt
diff --git a/Zend/tests/array_multisort_exception.phpt b/Zend/tests/arrays/array_multisort_exception.phpt
similarity index 100%
rename from Zend/tests/array_multisort_exception.phpt
rename to Zend/tests/arrays/array_multisort_exception.phpt
diff --git a/Zend/tests/array_offset.phpt b/Zend/tests/arrays/array_offset.phpt
similarity index 100%
rename from Zend/tests/array_offset.phpt
rename to Zend/tests/arrays/array_offset.phpt
diff --git a/Zend/tests/array_offset_002.phpt b/Zend/tests/arrays/array_offset_002.phpt
similarity index 100%
rename from Zend/tests/array_offset_002.phpt
rename to Zend/tests/arrays/array_offset_002.phpt
diff --git a/Zend/tests/array_self_add_globals.phpt b/Zend/tests/arrays/array_self_add_globals.phpt
similarity index 100%
rename from Zend/tests/array_self_add_globals.phpt
rename to Zend/tests/arrays/array_self_add_globals.phpt
diff --git a/Zend/tests/array_splice_empty_ht_iter_removal.phpt b/Zend/tests/arrays/array_splice_empty_ht_iter_removal.phpt
similarity index 100%
rename from Zend/tests/array_splice_empty_ht_iter_removal.phpt
rename to Zend/tests/arrays/array_splice_empty_ht_iter_removal.phpt
diff --git a/Zend/tests/array_unpack_string_keys.phpt b/Zend/tests/arrays/array_unpack_string_keys.phpt
similarity index 100%
rename from Zend/tests/array_unpack_string_keys.phpt
rename to Zend/tests/arrays/array_unpack_string_keys.phpt
diff --git a/Zend/tests/array_unshift_COW.phpt b/Zend/tests/arrays/array_unshift_COW.phpt
similarity index 100%
rename from Zend/tests/array_unshift_COW.phpt
rename to Zend/tests/arrays/array_unshift_COW.phpt
diff --git a/Zend/tests/array_with_refs_identical.phpt b/Zend/tests/arrays/array_with_refs_identical.phpt
similarity index 100%
rename from Zend/tests/array_with_refs_identical.phpt
rename to Zend/tests/arrays/array_with_refs_identical.phpt
diff --git a/Zend/tests/sub_001.phpt b/Zend/tests/arrays/sub_001.phpt
similarity index 100%
rename from Zend/tests/sub_001.phpt
rename to Zend/tests/arrays/sub_001.phpt
diff --git a/Zend/tests/add_001.phpt b/Zend/tests/assignment/add_001.phpt
similarity index 100%
rename from Zend/tests/add_001.phpt
rename to Zend/tests/assignment/add_001.phpt
diff --git a/Zend/tests/add_002.phpt b/Zend/tests/assignment/add_002.phpt
similarity index 100%
rename from Zend/tests/add_002.phpt
rename to Zend/tests/assignment/add_002.phpt
diff --git a/Zend/tests/add_003.phpt b/Zend/tests/assignment/add_003.phpt
similarity index 100%
rename from Zend/tests/add_003.phpt
rename to Zend/tests/assignment/add_003.phpt
diff --git a/Zend/tests/add_004.phpt b/Zend/tests/assignment/add_004.phpt
similarity index 100%
rename from Zend/tests/add_004.phpt
rename to Zend/tests/assignment/add_004.phpt
diff --git a/Zend/tests/add_005.phpt b/Zend/tests/assignment/add_005.phpt
similarity index 100%
rename from Zend/tests/add_005.phpt
rename to Zend/tests/assignment/add_005.phpt
diff --git a/Zend/tests/add_006.phpt b/Zend/tests/assignment/add_006.phpt
similarity index 100%
rename from Zend/tests/add_006.phpt
rename to Zend/tests/assignment/add_006.phpt
diff --git a/Zend/tests/add_007.phpt b/Zend/tests/assignment/add_007.phpt
similarity index 100%
rename from Zend/tests/add_007.phpt
rename to Zend/tests/assignment/add_007.phpt
diff --git a/Zend/tests/assign_array_object_property.phpt b/Zend/tests/assignment/assign_array_object_property.phpt
similarity index 100%
rename from Zend/tests/assign_array_object_property.phpt
rename to Zend/tests/assignment/assign_array_object_property.phpt
diff --git a/Zend/tests/assign_by_val_function_by_ref_return_value.phpt b/Zend/tests/assignment/assign_by_val_function_by_ref_return_value.phpt
similarity index 100%
rename from Zend/tests/assign_by_val_function_by_ref_return_value.phpt
rename to Zend/tests/assignment/assign_by_val_function_by_ref_return_value.phpt
diff --git a/Zend/tests/assign_dim_obj_null_return.phpt b/Zend/tests/assignment/assign_dim_obj_null_return.phpt
similarity index 100%
rename from Zend/tests/assign_dim_obj_null_return.phpt
rename to Zend/tests/assignment/assign_dim_obj_null_return.phpt
diff --git a/Zend/tests/assign_dim_op_same_var.phpt b/Zend/tests/assignment/assign_dim_op_same_var.phpt
similarity index 100%
rename from Zend/tests/assign_dim_op_same_var.phpt
rename to Zend/tests/assignment/assign_dim_op_same_var.phpt
diff --git a/Zend/tests/assign_dim_op_undef.phpt b/Zend/tests/assignment/assign_dim_op_undef.phpt
similarity index 100%
rename from Zend/tests/assign_dim_op_undef.phpt
rename to Zend/tests/assignment/assign_dim_op_undef.phpt
diff --git a/Zend/tests/assign_dim_ref_free.phpt b/Zend/tests/assignment/assign_dim_ref_free.phpt
similarity index 100%
rename from Zend/tests/assign_dim_ref_free.phpt
rename to Zend/tests/assignment/assign_dim_ref_free.phpt
diff --git a/Zend/tests/assign_obj_op_cache_slot.phpt b/Zend/tests/assignment/assign_obj_op_cache_slot.phpt
similarity index 100%
rename from Zend/tests/assign_obj_op_cache_slot.phpt
rename to Zend/tests/assignment/assign_obj_op_cache_slot.phpt
diff --git a/Zend/tests/assign_obj_ref_byval_function.phpt b/Zend/tests/assignment/assign_obj_ref_byval_function.phpt
similarity index 100%
rename from Zend/tests/assign_obj_ref_byval_function.phpt
rename to Zend/tests/assignment/assign_obj_ref_byval_function.phpt
diff --git a/Zend/tests/assign_obj_ref_return.phpt b/Zend/tests/assignment/assign_obj_ref_return.phpt
similarity index 100%
rename from Zend/tests/assign_obj_ref_return.phpt
rename to Zend/tests/assignment/assign_obj_ref_return.phpt
diff --git a/Zend/tests/assign_obj_to_ref_inference.phpt b/Zend/tests/assignment/assign_obj_to_ref_inference.phpt
similarity index 100%
rename from Zend/tests/assign_obj_to_ref_inference.phpt
rename to Zend/tests/assignment/assign_obj_to_ref_inference.phpt
diff --git a/Zend/tests/assign_op_type_error.phpt b/Zend/tests/assignment/assign_op_type_error.phpt
similarity index 100%
rename from Zend/tests/assign_op_type_error.phpt
rename to Zend/tests/assignment/assign_op_type_error.phpt
diff --git a/Zend/tests/assign_property_null_object.phpt b/Zend/tests/assignment/assign_property_null_object.phpt
similarity index 100%
rename from Zend/tests/assign_property_null_object.phpt
rename to Zend/tests/assignment/assign_property_null_object.phpt
diff --git a/Zend/tests/assign_ref_error_var_handling.phpt b/Zend/tests/assignment/assign_ref_error_var_handling.phpt
similarity index 100%
rename from Zend/tests/assign_ref_error_var_handling.phpt
rename to Zend/tests/assignment/assign_ref_error_var_handling.phpt
diff --git a/Zend/tests/assign_ref_func_leak.phpt b/Zend/tests/assignment/assign_ref_func_leak.phpt
similarity index 100%
rename from Zend/tests/assign_ref_func_leak.phpt
rename to Zend/tests/assignment/assign_ref_func_leak.phpt
diff --git a/Zend/tests/assign_ref_to_overloaded_prop.phpt b/Zend/tests/assignment/assign_ref_to_overloaded_prop.phpt
similarity index 100%
rename from Zend/tests/assign_ref_to_overloaded_prop.phpt
rename to Zend/tests/assignment/assign_ref_to_overloaded_prop.phpt
diff --git a/Zend/tests/assign_to_obj_001.phpt b/Zend/tests/assignment/assign_to_obj_001.phpt
similarity index 100%
rename from Zend/tests/assign_to_obj_001.phpt
rename to Zend/tests/assignment/assign_to_obj_001.phpt
diff --git a/Zend/tests/assign_to_obj_002.phpt b/Zend/tests/assignment/assign_to_obj_002.phpt
similarity index 100%
rename from Zend/tests/assign_to_obj_002.phpt
rename to Zend/tests/assignment/assign_to_obj_002.phpt
diff --git a/Zend/tests/assign_to_var_001.phpt b/Zend/tests/assignment/assign_to_var_001.phpt
similarity index 100%
rename from Zend/tests/assign_to_var_001.phpt
rename to Zend/tests/assignment/assign_to_var_001.phpt
diff --git a/Zend/tests/assign_to_var_002.phpt b/Zend/tests/assignment/assign_to_var_002.phpt
similarity index 100%
rename from Zend/tests/assign_to_var_002.phpt
rename to Zend/tests/assignment/assign_to_var_002.phpt
diff --git a/Zend/tests/assign_to_var_003.phpt b/Zend/tests/assignment/assign_to_var_003.phpt
similarity index 100%
rename from Zend/tests/assign_to_var_003.phpt
rename to Zend/tests/assignment/assign_to_var_003.phpt
diff --git a/Zend/tests/assign_to_var_004.phpt b/Zend/tests/assignment/assign_to_var_004.phpt
similarity index 100%
rename from Zend/tests/assign_to_var_004.phpt
rename to Zend/tests/assignment/assign_to_var_004.phpt
diff --git a/Zend/tests/assign_typed_ref_result.phpt b/Zend/tests/assignment/assign_typed_ref_result.phpt
similarity index 100%
rename from Zend/tests/assign_typed_ref_result.phpt
rename to Zend/tests/assignment/assign_typed_ref_result.phpt
diff --git a/Zend/tests/and_001.phpt b/Zend/tests/bitwise/and_001.phpt
similarity index 100%
rename from Zend/tests/and_001.phpt
rename to Zend/tests/bitwise/and_001.phpt
diff --git a/Zend/tests/not_001.phpt b/Zend/tests/bitwise/not_001.phpt
similarity index 100%
rename from Zend/tests/not_001.phpt
rename to Zend/tests/bitwise/not_001.phpt
diff --git a/Zend/tests/not_002.phpt b/Zend/tests/bitwise/not_002.phpt
similarity index 100%
rename from Zend/tests/not_002.phpt
rename to Zend/tests/bitwise/not_002.phpt
diff --git a/Zend/tests/or_001.phpt b/Zend/tests/bitwise/or_001.phpt
similarity index 100%
rename from Zend/tests/or_001.phpt
rename to Zend/tests/bitwise/or_001.phpt
diff --git a/Zend/tests/self_or.phpt b/Zend/tests/bitwise/self_or.phpt
similarity index 100%
rename from Zend/tests/self_or.phpt
rename to Zend/tests/bitwise/self_or.phpt
diff --git a/Zend/tests/self_xor.phpt b/Zend/tests/bitwise/self_xor.phpt
similarity index 100%
rename from Zend/tests/self_xor.phpt
rename to Zend/tests/bitwise/self_xor.phpt
diff --git a/Zend/tests/shift_001.phpt b/Zend/tests/bitwise/shift_001.phpt
similarity index 100%
rename from Zend/tests/shift_001.phpt
rename to Zend/tests/bitwise/shift_001.phpt
diff --git a/Zend/tests/shift_002.phpt b/Zend/tests/bitwise/shift_002.phpt
similarity index 100%
rename from Zend/tests/shift_002.phpt
rename to Zend/tests/bitwise/shift_002.phpt
diff --git a/Zend/tests/xor_001.phpt b/Zend/tests/bitwise/xor_001.phpt
similarity index 100%
rename from Zend/tests/xor_001.phpt
rename to Zend/tests/bitwise/xor_001.phpt
diff --git a/Zend/tests/xor_002.phpt b/Zend/tests/bitwise/xor_002.phpt
similarity index 100%
rename from Zend/tests/xor_002.phpt
rename to Zend/tests/bitwise/xor_002.phpt
diff --git a/Zend/tests/xor_003.phpt b/Zend/tests/bitwise/xor_003.phpt
similarity index 100%
rename from Zend/tests/xor_003.phpt
rename to Zend/tests/bitwise/xor_003.phpt
diff --git a/Zend/tests/string_to_number_comparison.phpt b/Zend/tests/comparison/string_to_number_comparison.phpt
similarity index 100%
rename from Zend/tests/string_to_number_comparison.phpt
rename to Zend/tests/comparison/string_to_number_comparison.phpt
diff --git a/Zend/tests/break_error_001.phpt b/Zend/tests/control_flow/break_error_001.phpt
similarity index 100%
rename from Zend/tests/break_error_001.phpt
rename to Zend/tests/control_flow/break_error_001.phpt
diff --git a/Zend/tests/break_error_002.phpt b/Zend/tests/control_flow/break_error_002.phpt
similarity index 100%
rename from Zend/tests/break_error_002.phpt
rename to Zend/tests/control_flow/break_error_002.phpt
diff --git a/Zend/tests/break_error_003.phpt b/Zend/tests/control_flow/break_error_003.phpt
similarity index 100%
rename from Zend/tests/break_error_003.phpt
rename to Zend/tests/control_flow/break_error_003.phpt
diff --git a/Zend/tests/break_error_004.phpt b/Zend/tests/control_flow/break_error_004.phpt
similarity index 100%
rename from Zend/tests/break_error_004.phpt
rename to Zend/tests/control_flow/break_error_004.phpt
diff --git a/Zend/tests/frameless_bug_001.phpt b/Zend/tests/frameless/frameless_bug_001.phpt
similarity index 100%
rename from Zend/tests/frameless_bug_001.phpt
rename to Zend/tests/frameless/frameless_bug_001.phpt
diff --git a/Zend/tests/frameless_jmp_001.phpt b/Zend/tests/frameless/frameless_jmp_001.phpt
similarity index 100%
rename from Zend/tests/frameless_jmp_001.phpt
rename to Zend/tests/frameless/frameless_jmp_001.phpt
diff --git a/Zend/tests/frameless_jmp_002.phpt b/Zend/tests/frameless/frameless_jmp_002.phpt
similarity index 100%
rename from Zend/tests/frameless_jmp_002.phpt
rename to Zend/tests/frameless/frameless_jmp_002.phpt
diff --git a/Zend/tests/frameless_jmp_003.phpt b/Zend/tests/frameless/frameless_jmp_003.phpt
similarity index 100%
rename from Zend/tests/frameless_jmp_003.phpt
rename to Zend/tests/frameless/frameless_jmp_003.phpt
diff --git a/Zend/tests/frameless_jmp_004.phpt b/Zend/tests/frameless/frameless_jmp_004.phpt
similarity index 100%
rename from Zend/tests/frameless_jmp_004.phpt
rename to Zend/tests/frameless/frameless_jmp_004.phpt
diff --git a/Zend/tests/frameless_jmp_005.phpt b/Zend/tests/frameless/frameless_jmp_005.phpt
similarity index 100%
rename from Zend/tests/frameless_jmp_005.phpt
rename to Zend/tests/frameless/frameless_jmp_005.phpt
diff --git a/Zend/tests/frameless_throwing_destructor.phpt b/Zend/tests/frameless/frameless_throwing_destructor.phpt
similarity index 100%
rename from Zend/tests/frameless_throwing_destructor.phpt
rename to Zend/tests/frameless/frameless_throwing_destructor.phpt
diff --git a/Zend/tests/frameless_undefined_var.phpt b/Zend/tests/frameless/frameless_undefined_var.phpt
similarity index 100%
rename from Zend/tests/frameless_undefined_var.phpt
rename to Zend/tests/frameless/frameless_undefined_var.phpt
diff --git a/Zend/tests/func_arg_fetch_optimization.phpt b/Zend/tests/function_arguments/func_arg_fetch_optimization.phpt
similarity index 100%
rename from Zend/tests/func_arg_fetch_optimization.phpt
rename to Zend/tests/function_arguments/func_arg_fetch_optimization.phpt
diff --git a/Zend/tests/func_get_arg_basic.phpt b/Zend/tests/function_arguments/func_get_arg_basic.phpt
similarity index 100%
rename from Zend/tests/func_get_arg_basic.phpt
rename to Zend/tests/function_arguments/func_get_arg_basic.phpt
diff --git a/Zend/tests/func_get_arg_invalid.phpt b/Zend/tests/function_arguments/func_get_arg_invalid.phpt
similarity index 100%
rename from Zend/tests/func_get_arg_invalid.phpt
rename to Zend/tests/function_arguments/func_get_arg_invalid.phpt
diff --git a/Zend/tests/func_get_args.phpt b/Zend/tests/function_arguments/func_get_args.phpt
similarity index 100%
rename from Zend/tests/func_get_args.phpt
rename to Zend/tests/function_arguments/func_get_args.phpt
diff --git a/Zend/tests/func_get_args_basic.phpt b/Zend/tests/function_arguments/func_get_args_basic.phpt
similarity index 100%
rename from Zend/tests/func_get_args_basic.phpt
rename to Zend/tests/function_arguments/func_get_args_basic.phpt
diff --git a/Zend/tests/func_num_args_basic.phpt b/Zend/tests/function_arguments/func_num_args_basic.phpt
similarity index 100%
rename from Zend/tests/func_num_args_basic.phpt
rename to Zend/tests/function_arguments/func_num_args_basic.phpt
diff --git a/Zend/tests/func_sig_trailing_comma.phpt b/Zend/tests/function_arguments/func_sig_trailing_comma.phpt
similarity index 100%
rename from Zend/tests/func_sig_trailing_comma.phpt
rename to Zend/tests/function_arguments/func_sig_trailing_comma.phpt
diff --git a/Zend/tests/global_to_string_exception.phpt b/Zend/tests/globals/global_to_string_exception.phpt
similarity index 100%
rename from Zend/tests/global_to_string_exception.phpt
rename to Zend/tests/globals/global_to_string_exception.phpt
diff --git a/Zend/tests/global_with_side_effect_name.phpt b/Zend/tests/globals/global_with_side_effect_name.phpt
similarity index 100%
rename from Zend/tests/global_with_side_effect_name.phpt
rename to Zend/tests/globals/global_with_side_effect_name.phpt
diff --git a/Zend/tests/globals.inc b/Zend/tests/globals/globals.inc
similarity index 100%
rename from Zend/tests/globals.inc
rename to Zend/tests/globals/globals.inc
diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals/globals_001.phpt
similarity index 100%
rename from Zend/tests/globals_001.phpt
rename to Zend/tests/globals/globals_001.phpt
diff --git a/Zend/tests/globals_002.phpt b/Zend/tests/globals/globals_002.phpt
similarity index 100%
rename from Zend/tests/globals_002.phpt
rename to Zend/tests/globals/globals_002.phpt
diff --git a/Zend/tests/globals_003.phpt b/Zend/tests/globals/globals_003.phpt
similarity index 100%
rename from Zend/tests/globals_003.phpt
rename to Zend/tests/globals/globals_003.phpt
diff --git a/Zend/tests/globals_004.phpt b/Zend/tests/globals/globals_004.phpt
similarity index 100%
rename from Zend/tests/globals_004.phpt
rename to Zend/tests/globals/globals_004.phpt
diff --git a/Zend/tests/globals_005.phpt b/Zend/tests/globals/globals_005.phpt
similarity index 100%
rename from Zend/tests/globals_005.phpt
rename to Zend/tests/globals/globals_005.phpt
diff --git a/Zend/tests/int_conversion_exponents.phpt b/Zend/tests/integers/int_conversion_exponents.phpt
similarity index 100%
rename from Zend/tests/int_conversion_exponents.phpt
rename to Zend/tests/integers/int_conversion_exponents.phpt
diff --git a/Zend/tests/int_overflow_32bit.phpt b/Zend/tests/integers/int_overflow_32bit.phpt
similarity index 100%
rename from Zend/tests/int_overflow_32bit.phpt
rename to Zend/tests/integers/int_overflow_32bit.phpt
diff --git a/Zend/tests/int_overflow_64bit.phpt b/Zend/tests/integers/int_overflow_64bit.phpt
similarity index 100%
rename from Zend/tests/int_overflow_64bit.phpt
rename to Zend/tests/integers/int_overflow_64bit.phpt
diff --git a/Zend/tests/int_special_values.phpt b/Zend/tests/integers/int_special_values.phpt
similarity index 100%
rename from Zend/tests/int_special_values.phpt
rename to Zend/tests/integers/int_special_values.phpt
diff --git a/Zend/tests/int_static_prop_name.phpt b/Zend/tests/integers/int_static_prop_name.phpt
similarity index 100%
rename from Zend/tests/int_static_prop_name.phpt
rename to Zend/tests/integers/int_static_prop_name.phpt
diff --git a/Zend/tests/int_underflow_32bit.phpt b/Zend/tests/integers/int_underflow_32bit.phpt
similarity index 100%
rename from Zend/tests/int_underflow_32bit.phpt
rename to Zend/tests/integers/int_underflow_32bit.phpt
diff --git a/Zend/tests/int_underflow_64bit.phpt b/Zend/tests/integers/int_underflow_64bit.phpt
similarity index 100%
rename from Zend/tests/int_underflow_64bit.phpt
rename to Zend/tests/integers/int_underflow_64bit.phpt
diff --git a/Zend/tests/inter_007.phpt b/Zend/tests/interfaces/inter_007.phpt
similarity index 100%
rename from Zend/tests/inter_007.phpt
rename to Zend/tests/interfaces/inter_007.phpt
diff --git a/Zend/tests/inter_02.phpt b/Zend/tests/interfaces/inter_02.phpt
similarity index 100%
rename from Zend/tests/inter_02.phpt
rename to Zend/tests/interfaces/inter_02.phpt
diff --git a/Zend/tests/inter_03.phpt b/Zend/tests/interfaces/inter_03.phpt
similarity index 100%
rename from Zend/tests/inter_03.phpt
rename to Zend/tests/interfaces/inter_03.phpt
diff --git a/Zend/tests/inter_04.phpt b/Zend/tests/interfaces/inter_04.phpt
similarity index 100%
rename from Zend/tests/inter_04.phpt
rename to Zend/tests/interfaces/inter_04.phpt
diff --git a/Zend/tests/inter_05.phpt b/Zend/tests/interfaces/inter_05.phpt
similarity index 100%
rename from Zend/tests/inter_05.phpt
rename to Zend/tests/interfaces/inter_05.phpt
diff --git a/Zend/tests/inter_06.phpt b/Zend/tests/interfaces/inter_06.phpt
similarity index 100%
rename from Zend/tests/inter_06.phpt
rename to Zend/tests/interfaces/inter_06.phpt
diff --git a/Zend/tests/interface_exists_001.phpt b/Zend/tests/interfaces/interface_exists_001.phpt
similarity index 100%
rename from Zend/tests/interface_exists_001.phpt
rename to Zend/tests/interfaces/interface_exists_001.phpt
diff --git a/Zend/tests/interface_exists_002.phpt b/Zend/tests/interfaces/interface_exists_002.phpt
similarity index 100%
rename from Zend/tests/interface_exists_002.phpt
rename to Zend/tests/interfaces/interface_exists_002.phpt
diff --git a/Zend/tests/interface_exists_basic.phpt b/Zend/tests/interfaces/interface_exists_basic.phpt
similarity index 100%
rename from Zend/tests/interface_exists_basic.phpt
rename to Zend/tests/interfaces/interface_exists_basic.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/double_to_string.phpt b/Zend/tests/strings/double_to_string.phpt
similarity index 100%
rename from Zend/tests/double_to_string.phpt
rename to Zend/tests/strings/double_to_string.phpt
diff --git a/Zend/tests/double_to_string_64bit.phpt b/Zend/tests/strings/double_to_string_64bit.phpt
similarity index 100%
rename from Zend/tests/double_to_string_64bit.phpt
rename to Zend/tests/strings/double_to_string_64bit.phpt
diff --git a/Zend/tests/empty_str_offset.phpt b/Zend/tests/strings/empty_str_offset.phpt
similarity index 100%
rename from Zend/tests/empty_str_offset.phpt
rename to Zend/tests/strings/empty_str_offset.phpt
diff --git a/Zend/tests/offset_string.phpt b/Zend/tests/strings/offset_string.phpt
similarity index 100%
rename from Zend/tests/offset_string.phpt
rename to Zend/tests/strings/offset_string.phpt
diff --git a/Zend/tests/str_offset_001.phpt b/Zend/tests/strings/str_offset_001.phpt
similarity index 100%
rename from Zend/tests/str_offset_001.phpt
rename to Zend/tests/strings/str_offset_001.phpt
diff --git a/Zend/tests/str_offset_002.phpt b/Zend/tests/strings/str_offset_002.phpt
similarity index 100%
rename from Zend/tests/str_offset_002.phpt
rename to Zend/tests/strings/str_offset_002.phpt
diff --git a/Zend/tests/str_offset_003.phpt b/Zend/tests/strings/str_offset_003.phpt
similarity index 100%
rename from Zend/tests/str_offset_003.phpt
rename to Zend/tests/strings/str_offset_003.phpt
diff --git a/Zend/tests/str_offset_004.phpt b/Zend/tests/strings/str_offset_004.phpt
similarity index 100%
rename from Zend/tests/str_offset_004.phpt
rename to Zend/tests/strings/str_offset_004.phpt
diff --git a/Zend/tests/str_offset_005.phpt b/Zend/tests/strings/str_offset_005.phpt
similarity index 100%
rename from Zend/tests/str_offset_005.phpt
rename to Zend/tests/strings/str_offset_005.phpt
diff --git a/Zend/tests/str_offset_006.phpt b/Zend/tests/strings/str_offset_006.phpt
similarity index 100%
rename from Zend/tests/str_offset_006.phpt
rename to Zend/tests/strings/str_offset_006.phpt
diff --git a/Zend/tests/str_offset_007.phpt b/Zend/tests/strings/str_offset_007.phpt
similarity index 100%
rename from Zend/tests/str_offset_007.phpt
rename to Zend/tests/strings/str_offset_007.phpt
diff --git a/Zend/tests/str_offset_008.phpt b/Zend/tests/strings/str_offset_008.phpt
similarity index 100%
rename from Zend/tests/str_offset_008.phpt
rename to Zend/tests/strings/str_offset_008.phpt
diff --git a/Zend/tests/strcasecmp_basic.phpt b/Zend/tests/strings/strcasecmp_basic.phpt
similarity index 100%
rename from Zend/tests/strcasecmp_basic.phpt
rename to Zend/tests/strings/strcasecmp_basic.phpt
diff --git a/Zend/tests/strict_001.phpt b/Zend/tests/strings/strict_001.phpt
similarity index 100%
rename from Zend/tests/strict_001.phpt
rename to Zend/tests/strings/strict_001.phpt
diff --git a/Zend/tests/strict_002.phpt b/Zend/tests/strings/strict_002.phpt
similarity index 100%
rename from Zend/tests/strict_002.phpt
rename to Zend/tests/strings/strict_002.phpt
diff --git a/Zend/tests/string_offset_as_object.phpt b/Zend/tests/strings/string_offset_as_object.phpt
similarity index 100%
rename from Zend/tests/string_offset_as_object.phpt
rename to Zend/tests/strings/string_offset_as_object.phpt
diff --git a/Zend/tests/string_offset_errors.phpt b/Zend/tests/strings/string_offset_errors.phpt
similarity index 100%
rename from Zend/tests/string_offset_errors.phpt
rename to Zend/tests/strings/string_offset_errors.phpt
diff --git a/Zend/tests/string_offset_int_min_max.phpt b/Zend/tests/strings/string_offset_int_min_max.phpt
similarity index 100%
rename from Zend/tests/string_offset_int_min_max.phpt
rename to Zend/tests/strings/string_offset_int_min_max.phpt
diff --git a/Zend/tests/string_offset_optimization.phpt b/Zend/tests/strings/string_offset_optimization.phpt
similarity index 100%
rename from Zend/tests/string_offset_optimization.phpt
rename to Zend/tests/strings/string_offset_optimization.phpt
diff --git a/Zend/tests/strlen.phpt b/Zend/tests/strings/strlen.phpt
similarity index 100%
rename from Zend/tests/strlen.phpt
rename to Zend/tests/strings/strlen.phpt
diff --git a/Zend/tests/strlen_deprecation_to_exception.phpt b/Zend/tests/strings/strlen_deprecation_to_exception.phpt
similarity index 100%
rename from Zend/tests/strlen_deprecation_to_exception.phpt
rename to Zend/tests/strings/strlen_deprecation_to_exception.phpt
diff --git a/Zend/tests/strncasecmp_basic.phpt b/Zend/tests/strings/strncasecmp_basic.phpt
similarity index 100%
rename from Zend/tests/strncasecmp_basic.phpt
rename to Zend/tests/strings/strncasecmp_basic.phpt
diff --git a/Zend/tests/strncmp_basic.phpt b/Zend/tests/strings/strncmp_basic.phpt
similarity index 100%
rename from Zend/tests/strncmp_basic.phpt
rename to Zend/tests/strings/strncmp_basic.phpt
diff --git a/Zend/tests/number_or_str_zpp.phpt b/Zend/tests/zpp/number_or_str_zpp.phpt
similarity index 100%
rename from Zend/tests/number_or_str_zpp.phpt
rename to Zend/tests/zpp/number_or_str_zpp.phpt
diff --git a/Zend/tests/str_or_obj_of_class_zpp.phpt b/Zend/tests/zpp/str_or_obj_of_class_zpp.phpt
similarity index 100%
rename from Zend/tests/str_or_obj_of_class_zpp.phpt
rename to Zend/tests/zpp/str_or_obj_of_class_zpp.phpt
diff --git a/Zend/tests/str_or_obj_zpp.phpt b/Zend/tests/zpp/str_or_obj_zpp.phpt
similarity index 100%
rename from Zend/tests/str_or_obj_zpp.phpt
rename to Zend/tests/zpp/str_or_obj_zpp.phpt