diff --git a/Zend/tests/bug30346.phpt b/Zend/tests/ArrayAccess/bug30346.phpt
similarity index 100%
rename from Zend/tests/bug30346.phpt
rename to Zend/tests/ArrayAccess/bug30346.phpt
diff --git a/Zend/tests/bug33710.phpt b/Zend/tests/ArrayAccess/bug33710.phpt
similarity index 100%
rename from Zend/tests/bug33710.phpt
rename to Zend/tests/ArrayAccess/bug33710.phpt
diff --git a/Zend/tests/bug39297.phpt b/Zend/tests/ArrayAccess/bug39297.phpt
similarity index 100%
rename from Zend/tests/bug39297.phpt
rename to Zend/tests/ArrayAccess/bug39297.phpt
diff --git a/Zend/tests/bug41209.phpt b/Zend/tests/ArrayAccess/bug41209.phpt
similarity index 100%
rename from Zend/tests/bug41209.phpt
rename to Zend/tests/ArrayAccess/bug41209.phpt
diff --git a/Zend/tests/bug63217.phpt b/Zend/tests/ArrayAccess/bug63217.phpt
similarity index 100%
rename from Zend/tests/bug63217.phpt
rename to Zend/tests/ArrayAccess/bug63217.phpt
diff --git a/Zend/tests/bug64417.phpt b/Zend/tests/ArrayAccess/bug64417.phpt
similarity index 100%
rename from Zend/tests/bug64417.phpt
rename to Zend/tests/ArrayAccess/bug64417.phpt
diff --git a/Zend/tests/bug68896.phpt b/Zend/tests/ArrayAccess/bug68896.phpt
similarity index 100%
rename from Zend/tests/bug68896.phpt
rename to Zend/tests/ArrayAccess/bug68896.phpt
diff --git a/Zend/tests/bug69955.phpt b/Zend/tests/ArrayAccess/bug69955.phpt
similarity index 100%
rename from Zend/tests/bug69955.phpt
rename to Zend/tests/ArrayAccess/bug69955.phpt
diff --git a/Zend/tests/bug71731.phpt b/Zend/tests/ArrayAccess/bug71731.phpt
similarity index 100%
rename from Zend/tests/bug71731.phpt
rename to Zend/tests/ArrayAccess/bug71731.phpt
diff --git a/Zend/tests/bug78356.phpt b/Zend/tests/ArrayAccess/bug78356.phpt
similarity index 100%
rename from Zend/tests/bug78356.phpt
rename to Zend/tests/ArrayAccess/bug78356.phpt
diff --git a/Zend/tests/bug26697.phpt b/Zend/tests/autoload/bug26697.phpt
similarity index 100%
rename from Zend/tests/bug26697.phpt
rename to Zend/tests/autoload/bug26697.phpt
diff --git a/Zend/tests/bug33116.phpt b/Zend/tests/autoload/bug33116.phpt
similarity index 100%
rename from Zend/tests/bug33116.phpt
rename to Zend/tests/autoload/bug33116.phpt
diff --git a/Zend/tests/bug37138.phpt b/Zend/tests/autoload/bug37138.phpt
similarity index 100%
rename from Zend/tests/bug37138.phpt
rename to Zend/tests/autoload/bug37138.phpt
diff --git a/Zend/tests/bug39003.phpt b/Zend/tests/autoload/bug39003.phpt
similarity index 100%
rename from Zend/tests/bug39003.phpt
rename to Zend/tests/autoload/bug39003.phpt
diff --git a/Zend/tests/bug42798.phpt b/Zend/tests/autoload/bug42798.phpt
similarity index 100%
rename from Zend/tests/bug42798.phpt
rename to Zend/tests/autoload/bug42798.phpt
diff --git a/Zend/tests/bug46665.phpt b/Zend/tests/autoload/bug46665.phpt
similarity index 100%
rename from Zend/tests/bug46665.phpt
rename to Zend/tests/autoload/bug46665.phpt
diff --git a/Zend/tests/bug46665_autoload.inc b/Zend/tests/autoload/bug46665_autoload.inc
similarity index 100%
rename from Zend/tests/bug46665_autoload.inc
rename to Zend/tests/autoload/bug46665_autoload.inc
diff --git a/Zend/tests/bug49908.phpt b/Zend/tests/autoload/bug49908.phpt
similarity index 100%
rename from Zend/tests/bug49908.phpt
rename to Zend/tests/autoload/bug49908.phpt
diff --git a/Zend/tests/bug61011.phpt b/Zend/tests/autoload/bug61011.phpt
similarity index 100%
rename from Zend/tests/bug61011.phpt
rename to Zend/tests/autoload/bug61011.phpt
diff --git a/Zend/tests/bug63741.phpt b/Zend/tests/autoload/bug63741.phpt
similarity index 100%
rename from Zend/tests/bug63741.phpt
rename to Zend/tests/autoload/bug63741.phpt
diff --git a/Zend/tests/bug65322.phpt b/Zend/tests/autoload/bug65322.phpt
similarity index 100%
rename from Zend/tests/bug65322.phpt
rename to Zend/tests/autoload/bug65322.phpt
diff --git a/Zend/tests/bug78868.phpt b/Zend/tests/autoload/bug78868.phpt
similarity index 100%
rename from Zend/tests/bug78868.phpt
rename to Zend/tests/autoload/bug78868.phpt
diff --git a/Zend/tests/bug78921.phpt b/Zend/tests/autoload/bug78921.phpt
similarity index 100%
rename from Zend/tests/bug78921.phpt
rename to Zend/tests/autoload/bug78921.phpt
diff --git a/Zend/tests/bug54624.phpt b/Zend/tests/class_alias/bug54624.phpt
similarity index 100%
rename from Zend/tests/bug54624.phpt
rename to Zend/tests/class_alias/bug54624.phpt
diff --git a/Zend/tests/bug24884.phpt b/Zend/tests/clone/bug24884.phpt
similarity index 100%
rename from Zend/tests/bug24884.phpt
rename to Zend/tests/clone/bug24884.phpt
diff --git a/Zend/tests/bug27268.phpt b/Zend/tests/clone/bug27268.phpt
similarity index 100%
rename from Zend/tests/bug27268.phpt
rename to Zend/tests/clone/bug27268.phpt
diff --git a/Zend/tests/bug36071.phpt b/Zend/tests/clone/bug36071.phpt
similarity index 100%
rename from Zend/tests/bug36071.phpt
rename to Zend/tests/clone/bug36071.phpt
diff --git a/Zend/tests/bug42817.phpt b/Zend/tests/clone/bug42817.phpt
similarity index 100%
rename from Zend/tests/bug42817.phpt
rename to Zend/tests/clone/bug42817.phpt
diff --git a/Zend/tests/bug42818.phpt b/Zend/tests/clone/bug42818.phpt
similarity index 100%
rename from Zend/tests/bug42818.phpt
rename to Zend/tests/clone/bug42818.phpt
diff --git a/Zend/tests/bug68262.phpt b/Zend/tests/clone/bug68262.phpt
similarity index 100%
rename from Zend/tests/bug68262.phpt
rename to Zend/tests/clone/bug68262.phpt
diff --git a/Zend/tests/bug69996.phpt b/Zend/tests/clone/bug69996.phpt
similarity index 100%
rename from Zend/tests/bug69996.phpt
rename to Zend/tests/clone/bug69996.phpt
diff --git a/Zend/tests/bug79778.phpt b/Zend/tests/closures/bug79778.phpt
similarity index 100%
rename from Zend/tests/bug79778.phpt
rename to Zend/tests/closures/bug79778.phpt
diff --git a/Zend/tests/bug24699.phpt b/Zend/tests/constants/bug24699.phpt
similarity index 100%
rename from Zend/tests/bug24699.phpt
rename to Zend/tests/constants/bug24699.phpt
diff --git a/Zend/tests/bug30702.phpt b/Zend/tests/constants/bug30702.phpt
similarity index 100%
rename from Zend/tests/bug30702.phpt
rename to Zend/tests/constants/bug30702.phpt
diff --git a/Zend/tests/bug33732.phpt b/Zend/tests/constants/bug33732.phpt
similarity index 100%
rename from Zend/tests/bug33732.phpt
rename to Zend/tests/constants/bug33732.phpt
diff --git a/Zend/tests/bug41633_1.phpt b/Zend/tests/constants/bug41633_1.phpt
similarity index 100%
rename from Zend/tests/bug41633_1.phpt
rename to Zend/tests/constants/bug41633_1.phpt
diff --git a/Zend/tests/bug41633_2.phpt b/Zend/tests/constants/bug41633_2.phpt
similarity index 100%
rename from Zend/tests/bug41633_2.phpt
rename to Zend/tests/constants/bug41633_2.phpt
diff --git a/Zend/tests/bug41633_3.phpt b/Zend/tests/constants/bug41633_3.phpt
similarity index 100%
rename from Zend/tests/bug41633_3.phpt
rename to Zend/tests/constants/bug41633_3.phpt
diff --git a/Zend/tests/bug41633_4.phpt b/Zend/tests/constants/bug41633_4.phpt
similarity index 100%
rename from Zend/tests/bug41633_4.phpt
rename to Zend/tests/constants/bug41633_4.phpt
diff --git a/Zend/tests/bug41640.phpt b/Zend/tests/constants/bug41640.phpt
similarity index 100%
rename from Zend/tests/bug41640.phpt
rename to Zend/tests/constants/bug41640.phpt
diff --git a/Zend/tests/bug44827.phpt b/Zend/tests/constants/bug44827.phpt
similarity index 100%
rename from Zend/tests/bug44827.phpt
rename to Zend/tests/constants/bug44827.phpt
diff --git a/Zend/tests/bug45742.phpt b/Zend/tests/constants/bug45742.phpt
similarity index 100%
rename from Zend/tests/bug45742.phpt
rename to Zend/tests/constants/bug45742.phpt
diff --git a/Zend/tests/bug45910.phpt b/Zend/tests/constants/bug45910.phpt
similarity index 100%
rename from Zend/tests/bug45910.phpt
rename to Zend/tests/constants/bug45910.phpt
diff --git a/Zend/tests/bug45910_2.phpt b/Zend/tests/constants/bug45910_2.phpt
similarity index 100%
rename from Zend/tests/bug45910_2.phpt
rename to Zend/tests/constants/bug45910_2.phpt
diff --git a/Zend/tests/bug46304.phpt b/Zend/tests/constants/bug46304.phpt
similarity index 100%
rename from Zend/tests/bug46304.phpt
rename to Zend/tests/constants/bug46304.phpt
diff --git a/Zend/tests/bug48930.phpt b/Zend/tests/constants/bug48930.phpt
similarity index 100%
rename from Zend/tests/bug48930.phpt
rename to Zend/tests/constants/bug48930.phpt
diff --git a/Zend/tests/bug49472.phpt b/Zend/tests/constants/bug49472.phpt
similarity index 100%
rename from Zend/tests/bug49472.phpt
rename to Zend/tests/constants/bug49472.phpt
diff --git a/Zend/tests/bug50816.phpt b/Zend/tests/constants/bug50816.phpt
similarity index 100%
rename from Zend/tests/bug50816.phpt
rename to Zend/tests/constants/bug50816.phpt
diff --git a/Zend/tests/bug51791.phpt b/Zend/tests/constants/bug51791.phpt
similarity index 100%
rename from Zend/tests/bug51791.phpt
rename to Zend/tests/constants/bug51791.phpt
diff --git a/Zend/tests/bug53305.phpt b/Zend/tests/constants/bug53305.phpt
similarity index 100%
rename from Zend/tests/bug53305.phpt
rename to Zend/tests/constants/bug53305.phpt
diff --git a/Zend/tests/bug63976.phpt b/Zend/tests/constants/bug63976.phpt
similarity index 100%
rename from Zend/tests/bug63976.phpt
rename to Zend/tests/constants/bug63976.phpt
diff --git a/Zend/tests/bug65291.phpt b/Zend/tests/constants/bug65291.phpt
similarity index 100%
rename from Zend/tests/bug65291.phpt
rename to Zend/tests/constants/bug65291.phpt
diff --git a/Zend/tests/bug69676.phpt b/Zend/tests/constants/bug69676.phpt
similarity index 100%
rename from Zend/tests/bug69676.phpt
rename to Zend/tests/constants/bug69676.phpt
diff --git a/Zend/tests/bug69676_2.phpt b/Zend/tests/constants/bug69676_2.phpt
similarity index 100%
rename from Zend/tests/bug69676_2.phpt
rename to Zend/tests/constants/bug69676_2.phpt
diff --git a/Zend/tests/bug69676_3.phpt b/Zend/tests/constants/bug69676_3.phpt
similarity index 100%
rename from Zend/tests/bug69676_3.phpt
rename to Zend/tests/constants/bug69676_3.phpt
diff --git a/Zend/tests/bug69832.phpt b/Zend/tests/constants/bug69832.phpt
similarity index 100%
rename from Zend/tests/bug69832.phpt
rename to Zend/tests/constants/bug69832.phpt
diff --git a/Zend/tests/bug70164.phpt b/Zend/tests/constants/bug70164.phpt
similarity index 100%
rename from Zend/tests/bug70164.phpt
rename to Zend/tests/constants/bug70164.phpt
diff --git a/Zend/tests/bug74657.phpt b/Zend/tests/constants/bug74657.phpt
similarity index 100%
rename from Zend/tests/bug74657.phpt
rename to Zend/tests/constants/bug74657.phpt
diff --git a/Zend/tests/bug76754.phpt b/Zend/tests/constants/bug76754.phpt
similarity index 100%
rename from Zend/tests/bug76754.phpt
rename to Zend/tests/constants/bug76754.phpt
diff --git a/Zend/tests/bug72162.phpt b/Zend/tests/error_reporting/bug72162.phpt
similarity index 100%
rename from Zend/tests/bug72162.phpt
rename to Zend/tests/error_reporting/bug72162.phpt
diff --git a/Zend/tests/bug26698.phpt b/Zend/tests/exceptions/bug26698.phpt
similarity index 100%
rename from Zend/tests/bug26698.phpt
rename to Zend/tests/exceptions/bug26698.phpt
diff --git a/Zend/tests/bug47771.phpt b/Zend/tests/exceptions/bug47771.phpt
similarity index 100%
rename from Zend/tests/bug47771.phpt
rename to Zend/tests/exceptions/bug47771.phpt
diff --git a/Zend/tests/bug50005.phpt b/Zend/tests/exceptions/bug50005.phpt
similarity index 100%
rename from Zend/tests/bug50005.phpt
rename to Zend/tests/exceptions/bug50005.phpt
diff --git a/Zend/tests/bug70944.phpt b/Zend/tests/exceptions/bug70944.phpt
similarity index 100%
rename from Zend/tests/bug70944.phpt
rename to Zend/tests/exceptions/bug70944.phpt
diff --git a/Zend/tests/bug73338.phpt b/Zend/tests/exceptions/bug73338.phpt
similarity index 100%
rename from Zend/tests/bug73338.phpt
rename to Zend/tests/exceptions/bug73338.phpt
diff --git a/Zend/tests/bug76025.phpt b/Zend/tests/exceptions/bug76025.phpt
similarity index 100%
rename from Zend/tests/bug76025.phpt
rename to Zend/tests/exceptions/bug76025.phpt
diff --git a/Zend/tests/bug78239.phpt b/Zend/tests/exceptions/bug78239.phpt
similarity index 100%
rename from Zend/tests/bug78239.phpt
rename to Zend/tests/exceptions/bug78239.phpt
diff --git a/Zend/tests/bug78589.phpt b/Zend/tests/gc/bug78589.phpt
similarity index 100%
rename from Zend/tests/bug78589.phpt
rename to Zend/tests/gc/bug78589.phpt
diff --git a/Zend/tests/bug68775.phpt b/Zend/tests/generators/bug68775.phpt
similarity index 100%
rename from Zend/tests/bug68775.phpt
rename to Zend/tests/generators/bug68775.phpt
diff --git a/Zend/tests/bug69740.phpt b/Zend/tests/generators/bug69740.phpt
similarity index 100%
rename from Zend/tests/bug69740.phpt
rename to Zend/tests/generators/bug69740.phpt
diff --git a/Zend/tests/bug69989_1.phpt b/Zend/tests/generators/bug69989_1.phpt
similarity index 100%
rename from Zend/tests/bug69989_1.phpt
rename to Zend/tests/generators/bug69989_1.phpt
diff --git a/Zend/tests/bug69989_2.phpt b/Zend/tests/generators/bug69989_2.phpt
similarity index 100%
rename from Zend/tests/bug69989_2.phpt
rename to Zend/tests/generators/bug69989_2.phpt
diff --git a/Zend/tests/bug69989_3.phpt b/Zend/tests/generators/bug69989_3.phpt
similarity index 100%
rename from Zend/tests/bug69989_3.phpt
rename to Zend/tests/generators/bug69989_3.phpt
diff --git a/Zend/tests/bug71980.phpt b/Zend/tests/generators/bug71980.phpt
similarity index 100%
rename from Zend/tests/bug71980.phpt
rename to Zend/tests/generators/bug71980.phpt
diff --git a/Zend/tests/bug72373.phpt b/Zend/tests/generators/bug72373.phpt
similarity index 100%
rename from Zend/tests/bug72373.phpt
rename to Zend/tests/generators/bug72373.phpt
diff --git a/Zend/tests/bug74840.phpt b/Zend/tests/generators/bug74840.phpt
similarity index 100%
rename from Zend/tests/bug74840.phpt
rename to Zend/tests/generators/bug74840.phpt
diff --git a/Zend/tests/bug75786.phpt b/Zend/tests/generators/bug75786.phpt
similarity index 100%
rename from Zend/tests/bug75786.phpt
rename to Zend/tests/generators/bug75786.phpt
diff --git a/Zend/tests/bug76946.phpt b/Zend/tests/generators/bug76946.phpt
similarity index 100%
rename from Zend/tests/bug76946.phpt
rename to Zend/tests/generators/bug76946.phpt
diff --git a/Zend/tests/bug79657.phpt b/Zend/tests/generators/bug79657.phpt
similarity index 100%
rename from Zend/tests/bug79657.phpt
rename to Zend/tests/generators/bug79657.phpt
diff --git a/Zend/tests/bug79927.phpt b/Zend/tests/generators/bug79927.phpt
similarity index 100%
rename from Zend/tests/bug79927.phpt
rename to Zend/tests/generators/bug79927.phpt
diff --git a/Zend/tests/bug30889.phpt b/Zend/tests/magic_methods/bug30889.phpt
similarity index 100%
rename from Zend/tests/bug30889.phpt
rename to Zend/tests/magic_methods/bug30889.phpt
diff --git a/Zend/tests/bug32429.phpt b/Zend/tests/magic_methods/bug32429.phpt
similarity index 100%
rename from Zend/tests/bug32429.phpt
rename to Zend/tests/magic_methods/bug32429.phpt
diff --git a/Zend/tests/bug43450.phpt b/Zend/tests/magic_methods/bug43450.phpt
similarity index 100%
rename from Zend/tests/bug43450.phpt
rename to Zend/tests/magic_methods/bug43450.phpt
diff --git a/Zend/tests/bug46238.phpt b/Zend/tests/magic_methods/bug46238.phpt
similarity index 100%
rename from Zend/tests/bug46238.phpt
rename to Zend/tests/magic_methods/bug46238.phpt
diff --git a/Zend/tests/bug46409.phpt b/Zend/tests/magic_methods/bug46409.phpt
similarity index 100%
rename from Zend/tests/bug46409.phpt
rename to Zend/tests/magic_methods/bug46409.phpt
diff --git a/Zend/tests/bug47353.phpt b/Zend/tests/magic_methods/bug47353.phpt
similarity index 100%
rename from Zend/tests/bug47353.phpt
rename to Zend/tests/magic_methods/bug47353.phpt
diff --git a/Zend/tests/bug51421.phpt b/Zend/tests/magic_methods/bug51421.phpt
similarity index 100%
rename from Zend/tests/bug51421.phpt
rename to Zend/tests/magic_methods/bug51421.phpt
diff --git a/Zend/tests/bug51822.phpt b/Zend/tests/magic_methods/bug51822.phpt
similarity index 100%
rename from Zend/tests/bug51822.phpt
rename to Zend/tests/magic_methods/bug51822.phpt
diff --git a/Zend/tests/bug52879.phpt b/Zend/tests/magic_methods/bug52879.phpt
similarity index 100%
rename from Zend/tests/bug52879.phpt
rename to Zend/tests/magic_methods/bug52879.phpt
diff --git a/Zend/tests/bug61025.phpt b/Zend/tests/magic_methods/bug61025.phpt
similarity index 100%
rename from Zend/tests/bug61025.phpt
rename to Zend/tests/magic_methods/bug61025.phpt
diff --git a/Zend/tests/bug61970.phpt b/Zend/tests/magic_methods/bug61970.phpt
similarity index 100%
rename from Zend/tests/bug61970.phpt
rename to Zend/tests/magic_methods/bug61970.phpt
diff --git a/Zend/tests/bug61970_1.phpt b/Zend/tests/magic_methods/bug61970_1.phpt
similarity index 100%
rename from Zend/tests/bug61970_1.phpt
rename to Zend/tests/magic_methods/bug61970_1.phpt
diff --git a/Zend/tests/bug61970_2.phpt b/Zend/tests/magic_methods/bug61970_2.phpt
similarity index 100%
rename from Zend/tests/bug61970_2.phpt
rename to Zend/tests/magic_methods/bug61970_2.phpt
diff --git a/Zend/tests/bug63462.phpt b/Zend/tests/magic_methods/bug63462.phpt
similarity index 100%
rename from Zend/tests/bug63462.phpt
rename to Zend/tests/magic_methods/bug63462.phpt
diff --git a/Zend/tests/bug66609.phpt b/Zend/tests/magic_methods/bug66609.phpt
similarity index 100%
rename from Zend/tests/bug66609.phpt
rename to Zend/tests/magic_methods/bug66609.phpt
diff --git a/Zend/tests/bug69212.phpt b/Zend/tests/magic_methods/bug69212.phpt
similarity index 100%
rename from Zend/tests/bug69212.phpt
rename to Zend/tests/magic_methods/bug69212.phpt
diff --git a/Zend/tests/bug70215.phpt b/Zend/tests/magic_methods/bug70215.phpt
similarity index 100%
rename from Zend/tests/bug70215.phpt
rename to Zend/tests/magic_methods/bug70215.phpt
diff --git a/Zend/tests/bug70223.phpt b/Zend/tests/magic_methods/bug70223.phpt
similarity index 100%
rename from Zend/tests/bug70223.phpt
rename to Zend/tests/magic_methods/bug70223.phpt
diff --git a/Zend/tests/bug70967.phpt b/Zend/tests/magic_methods/bug70967.phpt
similarity index 100%
rename from Zend/tests/bug70967.phpt
rename to Zend/tests/magic_methods/bug70967.phpt
diff --git a/Zend/tests/bug71818.phpt b/Zend/tests/magic_methods/bug71818.phpt
similarity index 100%
rename from Zend/tests/bug71818.phpt
rename to Zend/tests/magic_methods/bug71818.phpt
diff --git a/Zend/tests/bug72177.phpt b/Zend/tests/magic_methods/bug72177.phpt
similarity index 100%
rename from Zend/tests/bug72177.phpt
rename to Zend/tests/magic_methods/bug72177.phpt
diff --git a/Zend/tests/bug72177_2.phpt b/Zend/tests/magic_methods/bug72177_2.phpt
similarity index 100%
rename from Zend/tests/bug72177_2.phpt
rename to Zend/tests/magic_methods/bug72177_2.phpt
diff --git a/Zend/tests/bug72854.phpt b/Zend/tests/magic_methods/bug72854.phpt
similarity index 100%
rename from Zend/tests/bug72854.phpt
rename to Zend/tests/magic_methods/bug72854.phpt
diff --git a/Zend/tests/bug73288.phpt b/Zend/tests/magic_methods/bug73288.phpt
similarity index 100%
rename from Zend/tests/bug73288.phpt
rename to Zend/tests/magic_methods/bug73288.phpt
diff --git a/Zend/tests/bug74053.phpt b/Zend/tests/magic_methods/bug74053.phpt
similarity index 100%
rename from Zend/tests/bug74053.phpt
rename to Zend/tests/magic_methods/bug74053.phpt
diff --git a/Zend/tests/bug77613.phpt b/Zend/tests/magic_methods/bug77613.phpt
similarity index 100%
rename from Zend/tests/bug77613.phpt
rename to Zend/tests/magic_methods/bug77613.phpt
diff --git a/Zend/tests/bug78973.phpt b/Zend/tests/magic_methods/bug78973.phpt
similarity index 100%
rename from Zend/tests/bug78973.phpt
rename to Zend/tests/magic_methods/bug78973.phpt
diff --git a/Zend/tests/bug80037.phpt b/Zend/tests/magic_methods/bug80037.phpt
similarity index 100%
rename from Zend/tests/bug80037.phpt
rename to Zend/tests/magic_methods/bug80037.phpt
diff --git a/Zend/tests/bug80045.phpt b/Zend/tests/magic_methods/bug80045.phpt
similarity index 100%
rename from Zend/tests/bug80045.phpt
rename to Zend/tests/magic_methods/bug80045.phpt
diff --git a/Zend/tests/bug78454_1.phpt b/Zend/tests/numeric_literal_separator/bug78454_1.phpt
similarity index 100%
rename from Zend/tests/bug78454_1.phpt
rename to Zend/tests/numeric_literal_separator/bug78454_1.phpt
diff --git a/Zend/tests/bug78454_2.phpt b/Zend/tests/numeric_literal_separator/bug78454_2.phpt
similarity index 100%
rename from Zend/tests/bug78454_2.phpt
rename to Zend/tests/numeric_literal_separator/bug78454_2.phpt
diff --git a/Zend/tests/bug68446.phpt b/Zend/tests/parameter_default_values/bug68446.phpt
similarity index 100%
rename from Zend/tests/bug68446.phpt
rename to Zend/tests/parameter_default_values/bug68446.phpt
diff --git a/Zend/tests/bug34045.phpt b/Zend/tests/serialize/bug34045.phpt
similarity index 100%
rename from Zend/tests/bug34045.phpt
rename to Zend/tests/serialize/bug34045.phpt
diff --git a/Zend/tests/bug64354.phpt b/Zend/tests/serialize/bug64354.phpt
similarity index 100%
rename from Zend/tests/bug64354.phpt
rename to Zend/tests/serialize/bug64354.phpt
diff --git a/Zend/tests/bug69761.phpt b/Zend/tests/serialize/bug69761.phpt
similarity index 100%
rename from Zend/tests/bug69761.phpt
rename to Zend/tests/serialize/bug69761.phpt
diff --git a/Zend/tests/bug70121.phpt b/Zend/tests/serialize/bug70121.phpt
similarity index 100%
rename from Zend/tests/bug70121.phpt
rename to Zend/tests/serialize/bug70121.phpt
diff --git a/Zend/tests/bug70187.phpt b/Zend/tests/serialize/bug70187.phpt
similarity index 100%
rename from Zend/tests/bug70187.phpt
rename to Zend/tests/serialize/bug70187.phpt
diff --git a/Zend/tests/bug70187_2.phpt b/Zend/tests/serialize/bug70187_2.phpt
similarity index 100%
rename from Zend/tests/bug70187_2.phpt
rename to Zend/tests/serialize/bug70187_2.phpt
diff --git a/Zend/tests/bug70253.phpt b/Zend/tests/serialize/bug70253.phpt
similarity index 100%
rename from Zend/tests/bug70253.phpt
rename to Zend/tests/serialize/bug70253.phpt
diff --git a/Zend/tests/bug71841.phpt b/Zend/tests/serialize/bug71841.phpt
similarity index 100%
rename from Zend/tests/bug71841.phpt
rename to Zend/tests/serialize/bug71841.phpt
diff --git a/Zend/tests/bug73900.phpt b/Zend/tests/serialize/bug73900.phpt
similarity index 100%
rename from Zend/tests/bug73900.phpt
rename to Zend/tests/serialize/bug73900.phpt
diff --git a/Zend/tests/bug76502.phpt b/Zend/tests/serialize/bug76502.phpt
similarity index 100%
rename from Zend/tests/bug76502.phpt
rename to Zend/tests/serialize/bug76502.phpt
diff --git a/Zend/tests/bug26281.phpt b/Zend/tests/switch/bug26281.phpt
similarity index 100%
rename from Zend/tests/bug26281.phpt
rename to Zend/tests/switch/bug26281.phpt
diff --git a/Zend/tests/bug26696.phpt b/Zend/tests/switch/bug26696.phpt
similarity index 100%
rename from Zend/tests/bug26696.phpt
rename to Zend/tests/switch/bug26696.phpt
diff --git a/Zend/tests/bug26801.phpt b/Zend/tests/switch/bug26801.phpt
similarity index 100%
rename from Zend/tests/bug26801.phpt
rename to Zend/tests/switch/bug26801.phpt
diff --git a/Zend/tests/bug29944.phpt b/Zend/tests/switch/bug29944.phpt
similarity index 100%
rename from Zend/tests/bug29944.phpt
rename to Zend/tests/switch/bug29944.phpt
diff --git a/Zend/tests/bug38623.phpt b/Zend/tests/switch/bug38623.phpt
similarity index 100%
rename from Zend/tests/bug38623.phpt
rename to Zend/tests/switch/bug38623.phpt
diff --git a/Zend/tests/bug71756.phpt b/Zend/tests/switch/bug71756.phpt
similarity index 100%
rename from Zend/tests/bug71756.phpt
rename to Zend/tests/switch/bug71756.phpt
diff --git a/Zend/tests/bug71914.phpt b/Zend/tests/switch/bug71914.phpt
similarity index 100%
rename from Zend/tests/bug71914.phpt
rename to Zend/tests/switch/bug71914.phpt
diff --git a/Zend/tests/bug72508.phpt b/Zend/tests/switch/bug72508.phpt
similarity index 100%
rename from Zend/tests/bug72508.phpt
rename to Zend/tests/switch/bug72508.phpt
diff --git a/Zend/tests/bug33318.phpt b/Zend/tests/throw/bug33318.phpt
similarity index 100%
rename from Zend/tests/bug33318.phpt
rename to Zend/tests/throw/bug33318.phpt
diff --git a/Zend/tests/bug55825.phpt b/Zend/tests/traits/bug55825.phpt
similarity index 100%
rename from Zend/tests/bug55825.phpt
rename to Zend/tests/traits/bug55825.phpt
diff --git a/Zend/tests/bug60536_001.phpt b/Zend/tests/traits/bug60536_001.phpt
similarity index 100%
rename from Zend/tests/bug60536_001.phpt
rename to Zend/tests/traits/bug60536_001.phpt
diff --git a/Zend/tests/bug60536_002.phpt b/Zend/tests/traits/bug60536_002.phpt
similarity index 100%
rename from Zend/tests/bug60536_002.phpt
rename to Zend/tests/traits/bug60536_002.phpt
diff --git a/Zend/tests/bug60536_003.phpt b/Zend/tests/traits/bug60536_003.phpt
similarity index 100%
rename from Zend/tests/bug60536_003.phpt
rename to Zend/tests/traits/bug60536_003.phpt
diff --git a/Zend/tests/bug60536_004.phpt b/Zend/tests/traits/bug60536_004.phpt
similarity index 100%
rename from Zend/tests/bug60536_004.phpt
rename to Zend/tests/traits/bug60536_004.phpt
diff --git a/Zend/tests/bug60536_005.phpt b/Zend/tests/traits/bug60536_005.phpt
similarity index 100%
rename from Zend/tests/bug60536_005.phpt
rename to Zend/tests/traits/bug60536_005.phpt
diff --git a/Zend/tests/bug62892.phpt b/Zend/tests/traits/bug62892.phpt
similarity index 100%
rename from Zend/tests/bug62892.phpt
rename to Zend/tests/traits/bug62892.phpt
diff --git a/Zend/tests/bug70156.phpt b/Zend/tests/traits/bug70156.phpt
similarity index 100%
rename from Zend/tests/bug70156.phpt
rename to Zend/tests/traits/bug70156.phpt
diff --git a/Zend/tests/bug67938.phpt b/Zend/tests/variadic/bug67938.phpt
similarity index 100%
rename from Zend/tests/bug67938.phpt
rename to Zend/tests/variadic/bug67938.phpt
diff --git a/Zend/tests/bug80049.phpt b/Zend/tests/variadic/bug80049.phpt
similarity index 100%
rename from Zend/tests/bug80049.phpt
rename to Zend/tests/variadic/bug80049.phpt