diff --git a/Zend/tests/abstract_inheritance_001.phpt b/Zend/tests/inheritance/abstract_inheritance_001.phpt
similarity index 100%
rename from Zend/tests/abstract_inheritance_001.phpt
rename to Zend/tests/inheritance/abstract_inheritance_001.phpt
diff --git a/Zend/tests/abstract_inheritance_002.phpt b/Zend/tests/inheritance/abstract_inheritance_002.phpt
similarity index 100%
rename from Zend/tests/abstract_inheritance_002.phpt
rename to Zend/tests/inheritance/abstract_inheritance_002.phpt
diff --git a/Zend/tests/abstract_inheritance_003.phpt b/Zend/tests/inheritance/abstract_inheritance_003.phpt
similarity index 100%
rename from Zend/tests/abstract_inheritance_003.phpt
rename to Zend/tests/inheritance/abstract_inheritance_003.phpt
diff --git a/Zend/tests/argument_restriction_001.phpt b/Zend/tests/inheritance/argument_restriction_001.phpt
similarity index 100%
rename from Zend/tests/argument_restriction_001.phpt
rename to Zend/tests/inheritance/argument_restriction_001.phpt
diff --git a/Zend/tests/argument_restriction_002.phpt b/Zend/tests/inheritance/argument_restriction_002.phpt
similarity index 100%
rename from Zend/tests/argument_restriction_002.phpt
rename to Zend/tests/inheritance/argument_restriction_002.phpt
diff --git a/Zend/tests/argument_restriction_003.phpt b/Zend/tests/inheritance/argument_restriction_003.phpt
similarity index 100%
rename from Zend/tests/argument_restriction_003.phpt
rename to Zend/tests/inheritance/argument_restriction_003.phpt
diff --git a/Zend/tests/argument_restriction_004.phpt b/Zend/tests/inheritance/argument_restriction_004.phpt
similarity index 100%
rename from Zend/tests/argument_restriction_004.phpt
rename to Zend/tests/inheritance/argument_restriction_004.phpt
diff --git a/Zend/tests/argument_restriction_005.phpt b/Zend/tests/inheritance/argument_restriction_005.phpt
similarity index 100%
rename from Zend/tests/argument_restriction_005.phpt
rename to Zend/tests/inheritance/argument_restriction_005.phpt
diff --git a/Zend/tests/argument_restriction_006.phpt b/Zend/tests/inheritance/argument_restriction_006.phpt
similarity index 100%
rename from Zend/tests/argument_restriction_006.phpt
rename to Zend/tests/inheritance/argument_restriction_006.phpt
diff --git a/Zend/tests/bug22725.phpt b/Zend/tests/inheritance/bug22725.phpt
similarity index 100%
rename from Zend/tests/bug22725.phpt
rename to Zend/tests/inheritance/bug22725.phpt
diff --git a/Zend/tests/bug29674.phpt b/Zend/tests/inheritance/bug29674.phpt
similarity index 100%
rename from Zend/tests/bug29674.phpt
rename to Zend/tests/inheritance/bug29674.phpt
diff --git a/Zend/tests/bug29689.phpt b/Zend/tests/inheritance/bug29689.phpt
similarity index 100%
rename from Zend/tests/bug29689.phpt
rename to Zend/tests/inheritance/bug29689.phpt
diff --git a/Zend/tests/bug30451.phpt b/Zend/tests/inheritance/bug30451.phpt
similarity index 100%
rename from Zend/tests/bug30451.phpt
rename to Zend/tests/inheritance/bug30451.phpt
diff --git a/Zend/tests/bug33277.phpt b/Zend/tests/inheritance/bug33277.phpt
similarity index 100%
rename from Zend/tests/bug33277.phpt
rename to Zend/tests/inheritance/bug33277.phpt
diff --git a/Zend/tests/bug37212.phpt b/Zend/tests/inheritance/bug37212.phpt
similarity index 100%
rename from Zend/tests/bug37212.phpt
rename to Zend/tests/inheritance/bug37212.phpt
diff --git a/Zend/tests/bug37632.phpt b/Zend/tests/inheritance/bug37632.phpt
similarity index 100%
rename from Zend/tests/bug37632.phpt
rename to Zend/tests/inheritance/bug37632.phpt
diff --git a/Zend/tests/bug38772.phpt b/Zend/tests/inheritance/bug38772.phpt
similarity index 100%
rename from Zend/tests/bug38772.phpt
rename to Zend/tests/inheritance/bug38772.phpt
diff --git a/Zend/tests/bug39721.phpt b/Zend/tests/inheritance/bug39721.phpt
similarity index 100%
rename from Zend/tests/bug39721.phpt
rename to Zend/tests/inheritance/bug39721.phpt
diff --git a/Zend/tests/bug41961.phpt b/Zend/tests/inheritance/bug41961.phpt
similarity index 100%
rename from Zend/tests/bug41961.phpt
rename to Zend/tests/inheritance/bug41961.phpt
diff --git a/Zend/tests/bug42211.phpt b/Zend/tests/inheritance/bug42211.phpt
similarity index 100%
rename from Zend/tests/bug42211.phpt
rename to Zend/tests/inheritance/bug42211.phpt
diff --git a/Zend/tests/bug43200.phpt b/Zend/tests/inheritance/bug43200.phpt
similarity index 100%
rename from Zend/tests/bug43200.phpt
rename to Zend/tests/inheritance/bug43200.phpt
diff --git a/Zend/tests/bug43200_2.phpt b/Zend/tests/inheritance/bug43200_2.phpt
similarity index 100%
rename from Zend/tests/bug43200_2.phpt
rename to Zend/tests/inheritance/bug43200_2.phpt
diff --git a/Zend/tests/bug43703.phpt b/Zend/tests/inheritance/bug43703.phpt
similarity index 100%
rename from Zend/tests/bug43703.phpt
rename to Zend/tests/inheritance/bug43703.phpt
diff --git a/Zend/tests/bug44141.phpt b/Zend/tests/inheritance/bug44141.phpt
similarity index 100%
rename from Zend/tests/bug44141.phpt
rename to Zend/tests/inheritance/bug44141.phpt
diff --git a/Zend/tests/bug44414.phpt b/Zend/tests/inheritance/bug44414.phpt
similarity index 100%
rename from Zend/tests/bug44414.phpt
rename to Zend/tests/inheritance/bug44414.phpt
diff --git a/Zend/tests/bug48215.phpt b/Zend/tests/inheritance/bug48215.phpt
similarity index 100%
rename from Zend/tests/bug48215.phpt
rename to Zend/tests/inheritance/bug48215.phpt
diff --git a/Zend/tests/bug48215_2.phpt b/Zend/tests/inheritance/bug48215_2.phpt
similarity index 100%
rename from Zend/tests/bug48215_2.phpt
rename to Zend/tests/inheritance/bug48215_2.phpt
diff --git a/Zend/tests/bug50810.phpt b/Zend/tests/inheritance/bug50810.phpt
similarity index 100%
rename from Zend/tests/bug50810.phpt
rename to Zend/tests/inheritance/bug50810.phpt
diff --git a/Zend/tests/bug53727.phpt b/Zend/tests/inheritance/bug53727.phpt
similarity index 100%
rename from Zend/tests/bug53727.phpt
rename to Zend/tests/inheritance/bug53727.phpt
diff --git a/Zend/tests/bug60161.phpt b/Zend/tests/inheritance/bug60161.phpt
similarity index 100%
rename from Zend/tests/bug60161.phpt
rename to Zend/tests/inheritance/bug60161.phpt
diff --git a/Zend/tests/bug60444.phpt b/Zend/tests/inheritance/bug60444.phpt
similarity index 100%
rename from Zend/tests/bug60444.phpt
rename to Zend/tests/inheritance/bug60444.phpt
diff --git a/Zend/tests/bug61761.phpt b/Zend/tests/inheritance/bug61761.phpt
similarity index 100%
rename from Zend/tests/bug61761.phpt
rename to Zend/tests/inheritance/bug61761.phpt
diff --git a/Zend/tests/bug62609.phpt b/Zend/tests/inheritance/bug62609.phpt
similarity index 100%
rename from Zend/tests/bug62609.phpt
rename to Zend/tests/inheritance/bug62609.phpt
diff --git a/Zend/tests/bug62609_2.phpt b/Zend/tests/inheritance/bug62609_2.phpt
similarity index 100%
rename from Zend/tests/bug62609_2.phpt
rename to Zend/tests/inheritance/bug62609_2.phpt
diff --git a/Zend/tests/bug62814.phpt b/Zend/tests/inheritance/bug62814.phpt
similarity index 100%
rename from Zend/tests/bug62814.phpt
rename to Zend/tests/inheritance/bug62814.phpt
diff --git a/Zend/tests/bug62956.phpt b/Zend/tests/inheritance/bug62956.phpt
similarity index 100%
rename from Zend/tests/bug62956.phpt
rename to Zend/tests/inheritance/bug62956.phpt
diff --git a/Zend/tests/bug63468.phpt b/Zend/tests/inheritance/bug63468.phpt
similarity index 100%
rename from Zend/tests/bug63468.phpt
rename to Zend/tests/inheritance/bug63468.phpt
diff --git a/Zend/tests/bug63816.phpt b/Zend/tests/inheritance/bug63816.phpt
similarity index 100%
rename from Zend/tests/bug63816.phpt
rename to Zend/tests/inheritance/bug63816.phpt
diff --git a/Zend/tests/bug66286.phpt b/Zend/tests/inheritance/bug66286.phpt
similarity index 100%
rename from Zend/tests/bug66286.phpt
rename to Zend/tests/inheritance/bug66286.phpt
diff --git a/Zend/tests/bug70873.phpt b/Zend/tests/inheritance/bug70873.phpt
similarity index 100%
rename from Zend/tests/bug70873.phpt
rename to Zend/tests/inheritance/bug70873.phpt
diff --git a/Zend/tests/bug70957.phpt b/Zend/tests/inheritance/bug70957.phpt
similarity index 100%
rename from Zend/tests/bug70957.phpt
rename to Zend/tests/inheritance/bug70957.phpt
diff --git a/Zend/tests/bug70997.phpt b/Zend/tests/inheritance/bug70997.phpt
similarity index 100%
rename from Zend/tests/bug70997.phpt
rename to Zend/tests/inheritance/bug70997.phpt
diff --git a/Zend/tests/bug71248.phpt b/Zend/tests/inheritance/bug71248.phpt
similarity index 100%
rename from Zend/tests/bug71248.phpt
rename to Zend/tests/inheritance/bug71248.phpt
diff --git a/Zend/tests/bug71414.phpt b/Zend/tests/inheritance/bug71414.phpt
similarity index 100%
rename from Zend/tests/bug71414.phpt
rename to Zend/tests/inheritance/bug71414.phpt
diff --git a/Zend/tests/bug71428.1.phpt b/Zend/tests/inheritance/bug71428.1.phpt
similarity index 100%
rename from Zend/tests/bug71428.1.phpt
rename to Zend/tests/inheritance/bug71428.1.phpt
diff --git a/Zend/tests/bug71428.2.phpt b/Zend/tests/inheritance/bug71428.2.phpt
similarity index 100%
rename from Zend/tests/bug71428.2.phpt
rename to Zend/tests/inheritance/bug71428.2.phpt
diff --git a/Zend/tests/bug71428.3.phpt b/Zend/tests/inheritance/bug71428.3.phpt
similarity index 100%
rename from Zend/tests/bug71428.3.phpt
rename to Zend/tests/inheritance/bug71428.3.phpt
diff --git a/Zend/tests/bug72119.phpt b/Zend/tests/inheritance/bug72119.phpt
similarity index 100%
rename from Zend/tests/bug72119.phpt
rename to Zend/tests/inheritance/bug72119.phpt
diff --git a/Zend/tests/bug72496.phpt b/Zend/tests/inheritance/bug72496.phpt
similarity index 100%
rename from Zend/tests/bug72496.phpt
rename to Zend/tests/inheritance/bug72496.phpt
diff --git a/Zend/tests/bug73987.phpt b/Zend/tests/inheritance/bug73987.phpt
similarity index 100%
rename from Zend/tests/bug73987.phpt
rename to Zend/tests/inheritance/bug73987.phpt
diff --git a/Zend/tests/bug73987_1.phpt b/Zend/tests/inheritance/bug73987_1.phpt
similarity index 100%
rename from Zend/tests/bug73987_1.phpt
rename to Zend/tests/inheritance/bug73987_1.phpt
diff --git a/Zend/tests/bug73987_2.phpt b/Zend/tests/inheritance/bug73987_2.phpt
similarity index 100%
rename from Zend/tests/bug73987_2.phpt
rename to Zend/tests/inheritance/bug73987_2.phpt
diff --git a/Zend/tests/bug73987_3.phpt b/Zend/tests/inheritance/bug73987_3.phpt
similarity index 100%
rename from Zend/tests/bug73987_3.phpt
rename to Zend/tests/inheritance/bug73987_3.phpt
diff --git a/Zend/tests/bug78344.phpt b/Zend/tests/inheritance/bug78344.phpt
similarity index 100%
rename from Zend/tests/bug78344.phpt
rename to Zend/tests/inheritance/bug78344.phpt
diff --git a/Zend/tests/bug79862.phpt b/Zend/tests/inheritance/bug79862.phpt
similarity index 100%
rename from Zend/tests/bug79862.phpt
rename to Zend/tests/inheritance/bug79862.phpt
diff --git a/Zend/tests/bug80126.phpt b/Zend/tests/inheritance/bug80126.phpt
similarity index 100%
rename from Zend/tests/bug80126.phpt
rename to Zend/tests/inheritance/bug80126.phpt
diff --git a/Zend/tests/bug80126_2.phpt b/Zend/tests/inheritance/bug80126_2.phpt
similarity index 100%
rename from Zend/tests/bug80126_2.phpt
rename to Zend/tests/inheritance/bug80126_2.phpt
diff --git a/Zend/tests/bug80391.phpt b/Zend/tests/inheritance/bug80391.phpt
similarity index 100%
rename from Zend/tests/bug80391.phpt
rename to Zend/tests/inheritance/bug80391.phpt
diff --git a/Zend/tests/constructor_abstract_grantparent.phpt b/Zend/tests/inheritance/constructor_abstract_grantparent.phpt
similarity index 100%
rename from Zend/tests/constructor_abstract_grantparent.phpt
rename to Zend/tests/inheritance/constructor_abstract_grantparent.phpt
diff --git a/Zend/tests/gh15907.phpt b/Zend/tests/inheritance/gh15907.phpt
similarity index 100%
rename from Zend/tests/gh15907.phpt
rename to Zend/tests/inheritance/gh15907.phpt
diff --git a/Zend/tests/gh16508.phpt b/Zend/tests/inheritance/gh16508.phpt
similarity index 100%
rename from Zend/tests/gh16508.phpt
rename to Zend/tests/inheritance/gh16508.phpt
diff --git a/Zend/tests/gh9407.phpt b/Zend/tests/inheritance/gh9407.phpt
similarity index 100%
rename from Zend/tests/gh9407.phpt
rename to Zend/tests/inheritance/gh9407.phpt
diff --git a/Zend/tests/grandparent_prototype.phpt b/Zend/tests/inheritance/grandparent_prototype.phpt
similarity index 100%
rename from Zend/tests/grandparent_prototype.phpt
rename to Zend/tests/inheritance/grandparent_prototype.phpt
diff --git a/Zend/tests/inherit_internal_static.phpt b/Zend/tests/inheritance/inherit_internal_static.phpt
similarity index 100%
rename from Zend/tests/inherit_internal_static.phpt
rename to Zend/tests/inheritance/inherit_internal_static.phpt
diff --git a/Zend/tests/interface_constructor_prototype_001.phpt b/Zend/tests/inheritance/interface_constructor_prototype_001.phpt
similarity index 100%
rename from Zend/tests/interface_constructor_prototype_001.phpt
rename to Zend/tests/inheritance/interface_constructor_prototype_001.phpt
diff --git a/Zend/tests/interface_constructor_prototype_002.phpt b/Zend/tests/inheritance/interface_constructor_prototype_002.phpt
similarity index 100%
rename from Zend/tests/interface_constructor_prototype_002.phpt
rename to Zend/tests/inheritance/interface_constructor_prototype_002.phpt
diff --git a/Zend/tests/unused_shared_static_variables.phpt b/Zend/tests/inheritance/unused_shared_static_variables.phpt
similarity index 100%
rename from Zend/tests/unused_shared_static_variables.phpt
rename to Zend/tests/inheritance/unused_shared_static_variables.phpt
diff --git a/Zend/tests/update_consts_shadowed_private_prop.phpt b/Zend/tests/inheritance/update_consts_shadowed_private_prop.phpt
similarity index 100%
rename from Zend/tests/update_consts_shadowed_private_prop.phpt
rename to Zend/tests/inheritance/update_consts_shadowed_private_prop.phpt