diff --git a/Zend/tests/bug77652.inc b/Zend/tests/anon/bug77652.inc
similarity index 100%
rename from Zend/tests/bug77652.inc
rename to Zend/tests/anon/bug77652.inc
diff --git a/Zend/tests/bug77652.phpt b/Zend/tests/anon/bug77652.phpt
similarity index 100%
rename from Zend/tests/bug77652.phpt
rename to Zend/tests/anon/bug77652.phpt
diff --git a/Zend/tests/bug70241.phpt b/Zend/tests/assert/bug70241.phpt
similarity index 100%
rename from Zend/tests/bug70241.phpt
rename to Zend/tests/assert/bug70241.phpt
diff --git a/Zend/tests/bug70293.phpt b/Zend/tests/assert/bug70293.phpt
similarity index 100%
rename from Zend/tests/bug70293.phpt
rename to Zend/tests/assert/bug70293.phpt
diff --git a/Zend/tests/bug71922.phpt b/Zend/tests/assert/bug71922.phpt
similarity index 100%
rename from Zend/tests/bug71922.phpt
rename to Zend/tests/assert/bug71922.phpt
diff --git a/Zend/tests/bug54268.phpt b/Zend/tests/class_alias/bug54268.phpt
similarity index 100%
rename from Zend/tests/bug54268.phpt
rename to Zend/tests/class_alias/bug54268.phpt
diff --git a/Zend/tests/bug62343.phpt b/Zend/tests/class_alias/bug62343.phpt
similarity index 100%
rename from Zend/tests/bug62343.phpt
rename to Zend/tests/class_alias/bug62343.phpt
diff --git a/Zend/tests/bug76451.inc b/Zend/tests/class_alias/bug76451.inc
similarity index 100%
rename from Zend/tests/bug76451.inc
rename to Zend/tests/class_alias/bug76451.inc
diff --git a/Zend/tests/bug76451.phpt b/Zend/tests/class_alias/bug76451.phpt
similarity index 100%
rename from Zend/tests/bug76451.phpt
rename to Zend/tests/class_alias/bug76451.phpt
diff --git a/Zend/tests/bug76451_2.inc b/Zend/tests/class_alias/bug76451_2.inc
similarity index 100%
rename from Zend/tests/bug76451_2.inc
rename to Zend/tests/class_alias/bug76451_2.inc
diff --git a/Zend/tests/bug76451_2.phpt b/Zend/tests/class_alias/bug76451_2.phpt
similarity index 100%
rename from Zend/tests/bug76451_2.phpt
rename to Zend/tests/class_alias/bug76451_2.phpt
diff --git a/Zend/tests/bug50146.phpt b/Zend/tests/closures/bug50146.phpt
similarity index 100%
rename from Zend/tests/bug50146.phpt
rename to Zend/tests/closures/bug50146.phpt
diff --git a/Zend/tests/bug52060.phpt b/Zend/tests/closures/bug52060.phpt
similarity index 100%
rename from Zend/tests/bug52060.phpt
rename to Zend/tests/closures/bug52060.phpt
diff --git a/Zend/tests/bug52193.phpt b/Zend/tests/closures/bug52193.phpt
similarity index 100%
rename from Zend/tests/bug52193.phpt
rename to Zend/tests/closures/bug52193.phpt
diff --git a/Zend/tests/bug53958.phpt b/Zend/tests/closures/bug53958.phpt
similarity index 100%
rename from Zend/tests/bug53958.phpt
rename to Zend/tests/closures/bug53958.phpt
diff --git a/Zend/tests/bug54358.phpt b/Zend/tests/closures/bug54358.phpt
similarity index 100%
rename from Zend/tests/bug54358.phpt
rename to Zend/tests/closures/bug54358.phpt
diff --git a/Zend/tests/bug54367.phpt b/Zend/tests/closures/bug54367.phpt
similarity index 100%
rename from Zend/tests/bug54367.phpt
rename to Zend/tests/closures/bug54367.phpt
diff --git a/Zend/tests/bug69802_2.phpt b/Zend/tests/closures/bug69802_2.phpt
similarity index 100%
rename from Zend/tests/bug69802_2.phpt
rename to Zend/tests/closures/bug69802_2.phpt
diff --git a/Zend/tests/bug70397.phpt b/Zend/tests/closures/bug70397.phpt
similarity index 100%
rename from Zend/tests/bug70397.phpt
rename to Zend/tests/closures/bug70397.phpt
diff --git a/Zend/tests/bug70630.phpt b/Zend/tests/closures/bug70630.phpt
similarity index 100%
rename from Zend/tests/bug70630.phpt
rename to Zend/tests/closures/bug70630.phpt
diff --git a/Zend/tests/bug70685.phpt b/Zend/tests/closures/bug70685.phpt
similarity index 100%
rename from Zend/tests/bug70685.phpt
rename to Zend/tests/closures/bug70685.phpt
diff --git a/Zend/tests/bug70987.phpt b/Zend/tests/closures/bug70987.phpt
similarity index 100%
rename from Zend/tests/bug70987.phpt
rename to Zend/tests/closures/bug70987.phpt
diff --git a/Zend/tests/bug75290.phpt b/Zend/tests/closures/bug75290.phpt
similarity index 100%
rename from Zend/tests/bug75290.phpt
rename to Zend/tests/closures/bug75290.phpt
diff --git a/Zend/tests/bug77627.phpt b/Zend/tests/closures/bug77627.phpt
similarity index 100%
rename from Zend/tests/bug77627.phpt
rename to Zend/tests/closures/bug77627.phpt
diff --git a/Zend/tests/bug78658.phpt b/Zend/tests/closures/bug78658.phpt
similarity index 100%
rename from Zend/tests/bug78658.phpt
rename to Zend/tests/closures/bug78658.phpt
diff --git a/Zend/tests/bug78689.phpt b/Zend/tests/closures/bug78689.phpt
similarity index 100%
rename from Zend/tests/bug78689.phpt
rename to Zend/tests/closures/bug78689.phpt
diff --git a/Zend/tests/bug79897.phpt b/Zend/tests/ctor_promotion/bug79897.phpt
similarity index 100%
rename from Zend/tests/bug79897.phpt
rename to Zend/tests/ctor_promotion/bug79897.phpt
diff --git a/Zend/tests/bug69537.phpt b/Zend/tests/debug_info/bug69537.phpt
similarity index 100%
rename from Zend/tests/bug69537.phpt
rename to Zend/tests/debug_info/bug69537.phpt
diff --git a/Zend/tests/bug46246.phpt b/Zend/tests/dynamic_call/bug46246.phpt
similarity index 100%
rename from Zend/tests/bug46246.phpt
rename to Zend/tests/dynamic_call/bug46246.phpt
diff --git a/Zend/tests/bug47880.phpt b/Zend/tests/dynamic_call/bug47880.phpt
similarity index 100%
rename from Zend/tests/bug47880.phpt
rename to Zend/tests/dynamic_call/bug47880.phpt
diff --git a/Zend/tests/bug48770.phpt b/Zend/tests/dynamic_call/bug48770.phpt
similarity index 100%
rename from Zend/tests/bug48770.phpt
rename to Zend/tests/dynamic_call/bug48770.phpt
diff --git a/Zend/tests/bug48770_2.phpt b/Zend/tests/dynamic_call/bug48770_2.phpt
similarity index 100%
rename from Zend/tests/bug48770_2.phpt
rename to Zend/tests/dynamic_call/bug48770_2.phpt
diff --git a/Zend/tests/bug48770_3.phpt b/Zend/tests/dynamic_call/bug48770_3.phpt
similarity index 100%
rename from Zend/tests/bug48770_3.phpt
rename to Zend/tests/dynamic_call/bug48770_3.phpt
diff --git a/Zend/tests/bug52940.phpt b/Zend/tests/dynamic_call/bug52940.phpt
similarity index 100%
rename from Zend/tests/bug52940.phpt
rename to Zend/tests/dynamic_call/bug52940.phpt
diff --git a/Zend/tests/bug54910.phpt b/Zend/tests/dynamic_call/bug54910.phpt
similarity index 100%
rename from Zend/tests/bug54910.phpt
rename to Zend/tests/dynamic_call/bug54910.phpt
diff --git a/Zend/tests/bug61273.phpt b/Zend/tests/dynamic_call/bug61273.phpt
similarity index 100%
rename from Zend/tests/bug61273.phpt
rename to Zend/tests/dynamic_call/bug61273.phpt
diff --git a/Zend/tests/bug63173.phpt b/Zend/tests/dynamic_call/bug63173.phpt
similarity index 100%
rename from Zend/tests/bug63173.phpt
rename to Zend/tests/dynamic_call/bug63173.phpt
diff --git a/Zend/tests/bug68475.phpt b/Zend/tests/dynamic_call/bug68475.phpt
similarity index 100%
rename from Zend/tests/bug68475.phpt
rename to Zend/tests/dynamic_call/bug68475.phpt
diff --git a/Zend/tests/bug69124.phpt b/Zend/tests/dynamic_call/bug69124.phpt
similarity index 100%
rename from Zend/tests/bug69124.phpt
rename to Zend/tests/dynamic_call/bug69124.phpt
diff --git a/Zend/tests/bug69167.phpt b/Zend/tests/dynamic_call/bug69167.phpt
similarity index 100%
rename from Zend/tests/bug69167.phpt
rename to Zend/tests/dynamic_call/bug69167.phpt
diff --git a/Zend/tests/bug77877.phpt b/Zend/tests/dynamic_call/bug77877.phpt
similarity index 100%
rename from Zend/tests/bug77877.phpt
rename to Zend/tests/dynamic_call/bug77877.phpt
diff --git a/Zend/tests/bug78898.phpt b/Zend/tests/dynamic_call/bug78898.phpt
similarity index 100%
rename from Zend/tests/bug78898.phpt
rename to Zend/tests/dynamic_call/bug78898.phpt
diff --git a/Zend/tests/bug43344_1.phpt b/Zend/tests/errmsg/bug43344_1.phpt
similarity index 100%
rename from Zend/tests/bug43344_1.phpt
rename to Zend/tests/errmsg/bug43344_1.phpt
diff --git a/Zend/tests/bug43344_10.phpt b/Zend/tests/errmsg/bug43344_10.phpt
similarity index 100%
rename from Zend/tests/bug43344_10.phpt
rename to Zend/tests/errmsg/bug43344_10.phpt
diff --git a/Zend/tests/bug43344_11.phpt b/Zend/tests/errmsg/bug43344_11.phpt
similarity index 100%
rename from Zend/tests/bug43344_11.phpt
rename to Zend/tests/errmsg/bug43344_11.phpt
diff --git a/Zend/tests/bug43344_12.phpt b/Zend/tests/errmsg/bug43344_12.phpt
similarity index 100%
rename from Zend/tests/bug43344_12.phpt
rename to Zend/tests/errmsg/bug43344_12.phpt
diff --git a/Zend/tests/bug43344_13.phpt b/Zend/tests/errmsg/bug43344_13.phpt
similarity index 100%
rename from Zend/tests/bug43344_13.phpt
rename to Zend/tests/errmsg/bug43344_13.phpt
diff --git a/Zend/tests/bug43344_2.phpt b/Zend/tests/errmsg/bug43344_2.phpt
similarity index 100%
rename from Zend/tests/bug43344_2.phpt
rename to Zend/tests/errmsg/bug43344_2.phpt
diff --git a/Zend/tests/bug43344_3.phpt b/Zend/tests/errmsg/bug43344_3.phpt
similarity index 100%
rename from Zend/tests/bug43344_3.phpt
rename to Zend/tests/errmsg/bug43344_3.phpt
diff --git a/Zend/tests/bug43344_4.phpt b/Zend/tests/errmsg/bug43344_4.phpt
similarity index 100%
rename from Zend/tests/bug43344_4.phpt
rename to Zend/tests/errmsg/bug43344_4.phpt
diff --git a/Zend/tests/bug43344_5.phpt b/Zend/tests/errmsg/bug43344_5.phpt
similarity index 100%
rename from Zend/tests/bug43344_5.phpt
rename to Zend/tests/errmsg/bug43344_5.phpt
diff --git a/Zend/tests/bug43344_6.phpt b/Zend/tests/errmsg/bug43344_6.phpt
similarity index 100%
rename from Zend/tests/bug43344_6.phpt
rename to Zend/tests/errmsg/bug43344_6.phpt
diff --git a/Zend/tests/bug43344_7.phpt b/Zend/tests/errmsg/bug43344_7.phpt
similarity index 100%
rename from Zend/tests/bug43344_7.phpt
rename to Zend/tests/errmsg/bug43344_7.phpt
diff --git a/Zend/tests/bug43344_8.phpt b/Zend/tests/errmsg/bug43344_8.phpt
similarity index 100%
rename from Zend/tests/bug43344_8.phpt
rename to Zend/tests/errmsg/bug43344_8.phpt
diff --git a/Zend/tests/bug43344_9.phpt b/Zend/tests/errmsg/bug43344_9.phpt
similarity index 100%
rename from Zend/tests/bug43344_9.phpt
rename to Zend/tests/errmsg/bug43344_9.phpt
diff --git a/Zend/tests/bug27731.phpt b/Zend/tests/error_reporting/bug27731.phpt
similarity index 100%
rename from Zend/tests/bug27731.phpt
rename to Zend/tests/error_reporting/bug27731.phpt
diff --git a/Zend/tests/bug33771.phpt b/Zend/tests/error_reporting/bug33771.phpt
similarity index 100%
rename from Zend/tests/bug33771.phpt
rename to Zend/tests/error_reporting/bug33771.phpt
diff --git a/Zend/tests/bug81652.phpt b/Zend/tests/error_reporting/bug81652.phpt
similarity index 100%
rename from Zend/tests/bug81652.phpt
rename to Zend/tests/error_reporting/bug81652.phpt
diff --git a/Zend/tests/bug30161.phpt b/Zend/tests/exceptions/bug30161.phpt
similarity index 100%
rename from Zend/tests/bug30161.phpt
rename to Zend/tests/exceptions/bug30161.phpt
diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/exceptions/bug30162.phpt
similarity index 100%
rename from Zend/tests/bug30162.phpt
rename to Zend/tests/exceptions/bug30162.phpt
diff --git a/Zend/tests/bug30707.phpt b/Zend/tests/exceptions/bug30707.phpt
similarity index 100%
rename from Zend/tests/bug30707.phpt
rename to Zend/tests/exceptions/bug30707.phpt
diff --git a/Zend/tests/bug30725.phpt b/Zend/tests/exceptions/bug30725.phpt
similarity index 100%
rename from Zend/tests/bug30725.phpt
rename to Zend/tests/exceptions/bug30725.phpt
diff --git a/Zend/tests/bug31102.phpt b/Zend/tests/exceptions/bug31102.phpt
similarity index 100%
rename from Zend/tests/bug31102.phpt
rename to Zend/tests/exceptions/bug31102.phpt
diff --git a/Zend/tests/bug32226.phpt b/Zend/tests/exceptions/bug32226.phpt
similarity index 100%
rename from Zend/tests/bug32226.phpt
rename to Zend/tests/exceptions/bug32226.phpt
diff --git a/Zend/tests/bug32252.phpt b/Zend/tests/exceptions/bug32252.phpt
similarity index 100%
rename from Zend/tests/bug32252.phpt
rename to Zend/tests/exceptions/bug32252.phpt
diff --git a/Zend/tests/bug33802.phpt b/Zend/tests/exceptions/bug33802.phpt
similarity index 100%
rename from Zend/tests/bug33802.phpt
rename to Zend/tests/exceptions/bug33802.phpt
diff --git a/Zend/tests/bug45805.phpt b/Zend/tests/exceptions/bug45805.phpt
similarity index 100%
rename from Zend/tests/bug45805.phpt
rename to Zend/tests/exceptions/bug45805.phpt
diff --git a/Zend/tests/bug48228.phpt b/Zend/tests/exceptions/bug48228.phpt
similarity index 100%
rename from Zend/tests/bug48228.phpt
rename to Zend/tests/exceptions/bug48228.phpt
diff --git a/Zend/tests/bug48408.phpt b/Zend/tests/exceptions/bug48408.phpt
similarity index 100%
rename from Zend/tests/bug48408.phpt
rename to Zend/tests/exceptions/bug48408.phpt
diff --git a/Zend/tests/bug48409.phpt b/Zend/tests/exceptions/bug48409.phpt
similarity index 100%
rename from Zend/tests/bug48409.phpt
rename to Zend/tests/exceptions/bug48409.phpt
diff --git a/Zend/tests/bug48428.phpt b/Zend/tests/exceptions/bug48428.phpt
similarity index 100%
rename from Zend/tests/bug48428.phpt
rename to Zend/tests/exceptions/bug48428.phpt
diff --git a/Zend/tests/bug50383.phpt b/Zend/tests/exceptions/bug50383.phpt
similarity index 100%
rename from Zend/tests/bug50383.phpt
rename to Zend/tests/exceptions/bug50383.phpt
diff --git a/Zend/tests/bug51394.phpt b/Zend/tests/exceptions/bug51394.phpt
similarity index 100%
rename from Zend/tests/bug51394.phpt
rename to Zend/tests/exceptions/bug51394.phpt
diff --git a/Zend/tests/bug53511.phpt b/Zend/tests/exceptions/bug53511.phpt
similarity index 100%
rename from Zend/tests/bug53511.phpt
rename to Zend/tests/exceptions/bug53511.phpt
diff --git a/Zend/tests/bug60569.phpt b/Zend/tests/exceptions/bug60569.phpt
similarity index 100%
rename from Zend/tests/bug60569.phpt
rename to Zend/tests/exceptions/bug60569.phpt
diff --git a/Zend/tests/bug61362.phpt b/Zend/tests/exceptions/bug61362.phpt
similarity index 100%
rename from Zend/tests/bug61362.phpt
rename to Zend/tests/exceptions/bug61362.phpt
diff --git a/Zend/tests/bug63762.phpt b/Zend/tests/exceptions/bug63762.phpt
similarity index 100%
rename from Zend/tests/bug63762.phpt
rename to Zend/tests/exceptions/bug63762.phpt
diff --git a/Zend/tests/bug64135.phpt b/Zend/tests/exceptions/bug64135.phpt
similarity index 100%
rename from Zend/tests/bug64135.phpt
rename to Zend/tests/exceptions/bug64135.phpt
diff --git a/Zend/tests/bug64821.1.phpt b/Zend/tests/exceptions/bug64821.1.phpt
similarity index 100%
rename from Zend/tests/bug64821.1.phpt
rename to Zend/tests/exceptions/bug64821.1.phpt
diff --git a/Zend/tests/bug64821.2.phpt b/Zend/tests/exceptions/bug64821.2.phpt
similarity index 100%
rename from Zend/tests/bug64821.2.phpt
rename to Zend/tests/exceptions/bug64821.2.phpt
diff --git a/Zend/tests/bug64821.3.phpt b/Zend/tests/exceptions/bug64821.3.phpt
similarity index 100%
rename from Zend/tests/bug64821.3.phpt
rename to Zend/tests/exceptions/bug64821.3.phpt
diff --git a/Zend/tests/bug65254.phpt b/Zend/tests/exceptions/bug65254.phpt
similarity index 100%
rename from Zend/tests/bug65254.phpt
rename to Zend/tests/exceptions/bug65254.phpt
diff --git a/Zend/tests/bug70012.phpt b/Zend/tests/exceptions/bug70012.phpt
similarity index 100%
rename from Zend/tests/bug70012.phpt
rename to Zend/tests/exceptions/bug70012.phpt
diff --git a/Zend/tests/bug72581.phpt b/Zend/tests/exceptions/bug72581.phpt
similarity index 100%
rename from Zend/tests/bug72581.phpt
rename to Zend/tests/exceptions/bug72581.phpt
diff --git a/Zend/tests/bug73350.phpt b/Zend/tests/exceptions/bug73350.phpt
similarity index 100%
rename from Zend/tests/bug73350.phpt
rename to Zend/tests/exceptions/bug73350.phpt
diff --git a/Zend/tests/bug60978.phpt b/Zend/tests/exit/bug60978.phpt
similarity index 100%
rename from Zend/tests/bug60978.phpt
rename to Zend/tests/exit/bug60978.phpt
diff --git a/Zend/tests/bug79948.inc b/Zend/tests/exit/bug79948.inc
similarity index 100%
rename from Zend/tests/bug79948.inc
rename to Zend/tests/exit/bug79948.inc
diff --git a/Zend/tests/bug79948.phpt b/Zend/tests/exit/bug79948.phpt
similarity index 100%
rename from Zend/tests/bug79948.phpt
rename to Zend/tests/exit/bug79948.phpt
diff --git a/Zend/tests/bug33171.phpt b/Zend/tests/foreach/bug33171.phpt
similarity index 100%
rename from Zend/tests/bug33171.phpt
rename to Zend/tests/foreach/bug33171.phpt
diff --git a/Zend/tests/bug34065.phpt b/Zend/tests/foreach/bug34065.phpt
similarity index 100%
rename from Zend/tests/bug34065.phpt
rename to Zend/tests/foreach/bug34065.phpt
diff --git a/Zend/tests/bug34310.phpt b/Zend/tests/foreach/bug34310.phpt
similarity index 100%
rename from Zend/tests/bug34310.phpt
rename to Zend/tests/foreach/bug34310.phpt
diff --git a/Zend/tests/bug34467.phpt b/Zend/tests/foreach/bug34467.phpt
similarity index 100%
rename from Zend/tests/bug34467.phpt
rename to Zend/tests/foreach/bug34467.phpt
diff --git a/Zend/tests/bug34873.phpt b/Zend/tests/foreach/bug34873.phpt
similarity index 100%
rename from Zend/tests/bug34873.phpt
rename to Zend/tests/foreach/bug34873.phpt
diff --git a/Zend/tests/bug35106.phpt b/Zend/tests/foreach/bug35106.phpt
similarity index 100%
rename from Zend/tests/bug35106.phpt
rename to Zend/tests/foreach/bug35106.phpt
diff --git a/Zend/tests/bug37046.phpt b/Zend/tests/foreach/bug37046.phpt
similarity index 100%
rename from Zend/tests/bug37046.phpt
rename to Zend/tests/foreach/bug37046.phpt
diff --git a/Zend/tests/bug39017.phpt b/Zend/tests/foreach/bug39017.phpt
similarity index 100%
rename from Zend/tests/bug39017.phpt
rename to Zend/tests/foreach/bug39017.phpt
diff --git a/Zend/tests/bug39036.phpt b/Zend/tests/foreach/bug39036.phpt
similarity index 100%
rename from Zend/tests/bug39036.phpt
rename to Zend/tests/foreach/bug39036.phpt
diff --git a/Zend/tests/bug39825.phpt b/Zend/tests/foreach/bug39825.phpt
similarity index 100%
rename from Zend/tests/bug39825.phpt
rename to Zend/tests/foreach/bug39825.phpt
diff --git a/Zend/tests/bug39990.phpt b/Zend/tests/foreach/bug39990.phpt
similarity index 100%
rename from Zend/tests/bug39990.phpt
rename to Zend/tests/foreach/bug39990.phpt
diff --git a/Zend/tests/bug40705.phpt b/Zend/tests/foreach/bug40705.phpt
similarity index 100%
rename from Zend/tests/bug40705.phpt
rename to Zend/tests/foreach/bug40705.phpt
diff --git a/Zend/tests/bug41351.phpt b/Zend/tests/foreach/bug41351.phpt
similarity index 100%
rename from Zend/tests/bug41351.phpt
rename to Zend/tests/foreach/bug41351.phpt
diff --git a/Zend/tests/bug41351_2.phpt b/Zend/tests/foreach/bug41351_2.phpt
similarity index 100%
rename from Zend/tests/bug41351_2.phpt
rename to Zend/tests/foreach/bug41351_2.phpt
diff --git a/Zend/tests/bug41351_3.phpt b/Zend/tests/foreach/bug41351_3.phpt
similarity index 100%
rename from Zend/tests/bug41351_3.phpt
rename to Zend/tests/foreach/bug41351_3.phpt
diff --git a/Zend/tests/bug41929.phpt b/Zend/tests/foreach/bug41929.phpt
similarity index 100%
rename from Zend/tests/bug41929.phpt
rename to Zend/tests/foreach/bug41929.phpt
diff --git a/Zend/tests/bug67633.phpt b/Zend/tests/foreach/bug67633.phpt
similarity index 100%
rename from Zend/tests/bug67633.phpt
rename to Zend/tests/foreach/bug67633.phpt
diff --git a/Zend/tests/bug68215.phpt b/Zend/tests/foreach/bug68215.phpt
similarity index 100%
rename from Zend/tests/bug68215.phpt
rename to Zend/tests/foreach/bug68215.phpt
diff --git a/Zend/tests/bug73792.phpt b/Zend/tests/foreach/bug73792.phpt
similarity index 100%
rename from Zend/tests/bug73792.phpt
rename to Zend/tests/foreach/bug73792.phpt
diff --git a/Zend/tests/bug76800.phpt b/Zend/tests/foreach/bug76800.phpt
similarity index 100%
rename from Zend/tests/bug76800.phpt
rename to Zend/tests/foreach/bug76800.phpt
diff --git a/Zend/tests/bug43918.phpt b/Zend/tests/gc/bug43918.phpt
similarity index 100%
rename from Zend/tests/bug43918.phpt
rename to Zend/tests/gc/bug43918.phpt
diff --git a/Zend/tests/bug47343.phpt b/Zend/tests/gc/bug47343.phpt
similarity index 100%
rename from Zend/tests/bug47343.phpt
rename to Zend/tests/gc/bug47343.phpt
diff --git a/Zend/tests/bug54305.phpt b/Zend/tests/gc/bug54305.phpt
similarity index 100%
rename from Zend/tests/bug54305.phpt
rename to Zend/tests/gc/bug54305.phpt
diff --git a/Zend/tests/bug60138.phpt b/Zend/tests/gc/bug60138.phpt
similarity index 100%
rename from Zend/tests/bug60138.phpt
rename to Zend/tests/gc/bug60138.phpt
diff --git a/Zend/tests/bug60139.phpt b/Zend/tests/gc/bug60139.phpt
similarity index 100%
rename from Zend/tests/bug60139.phpt
rename to Zend/tests/gc/bug60139.phpt
diff --git a/Zend/tests/bug63055.phpt b/Zend/tests/gc/bug63055.phpt
similarity index 100%
rename from Zend/tests/bug63055.phpt
rename to Zend/tests/gc/bug63055.phpt
diff --git a/Zend/tests/bug63635.phpt b/Zend/tests/gc/bug63635.phpt
similarity index 100%
rename from Zend/tests/bug63635.phpt
rename to Zend/tests/gc/bug63635.phpt
diff --git a/Zend/tests/bug63734.phpt b/Zend/tests/gc/bug63734.phpt
similarity index 100%
rename from Zend/tests/bug63734.phpt
rename to Zend/tests/gc/bug63734.phpt
diff --git a/Zend/tests/bug64896.phpt b/Zend/tests/gc/bug64896.phpt
similarity index 100%
rename from Zend/tests/bug64896.phpt
rename to Zend/tests/gc/bug64896.phpt
diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/gc/bug64960.phpt
similarity index 100%
rename from Zend/tests/bug64960.phpt
rename to Zend/tests/gc/bug64960.phpt
diff --git a/Zend/tests/bug65372.phpt b/Zend/tests/gc/bug65372.phpt
similarity index 100%
rename from Zend/tests/bug65372.phpt
rename to Zend/tests/gc/bug65372.phpt
diff --git a/Zend/tests/bug67314.phpt b/Zend/tests/gc/bug67314.phpt
similarity index 100%
rename from Zend/tests/bug67314.phpt
rename to Zend/tests/gc/bug67314.phpt
diff --git a/Zend/tests/bug69446.phpt b/Zend/tests/gc/bug69446.phpt
similarity index 100%
rename from Zend/tests/bug69446.phpt
rename to Zend/tests/gc/bug69446.phpt
diff --git a/Zend/tests/bug69446_2.phpt b/Zend/tests/gc/bug69446_2.phpt
similarity index 100%
rename from Zend/tests/bug69446_2.phpt
rename to Zend/tests/gc/bug69446_2.phpt
diff --git a/Zend/tests/bug70805.phpt b/Zend/tests/gc/bug70805.phpt
similarity index 100%
rename from Zend/tests/bug70805.phpt
rename to Zend/tests/gc/bug70805.phpt
diff --git a/Zend/tests/bug70805_1.phpt b/Zend/tests/gc/bug70805_1.phpt
similarity index 100%
rename from Zend/tests/bug70805_1.phpt
rename to Zend/tests/gc/bug70805_1.phpt
diff --git a/Zend/tests/bug70805_2.phpt b/Zend/tests/gc/bug70805_2.phpt
similarity index 100%
rename from Zend/tests/bug70805_2.phpt
rename to Zend/tests/gc/bug70805_2.phpt
diff --git a/Zend/tests/bug72530.phpt b/Zend/tests/gc/bug72530.phpt
similarity index 100%
rename from Zend/tests/bug72530.phpt
rename to Zend/tests/gc/bug72530.phpt
diff --git a/Zend/tests/bug77345_gc_1.phpt b/Zend/tests/gc/bug77345_gc_1.phpt
similarity index 100%
rename from Zend/tests/bug77345_gc_1.phpt
rename to Zend/tests/gc/bug77345_gc_1.phpt
diff --git a/Zend/tests/bug77345_gc_2.phpt b/Zend/tests/gc/bug77345_gc_2.phpt
similarity index 100%
rename from Zend/tests/bug77345_gc_2.phpt
rename to Zend/tests/gc/bug77345_gc_2.phpt
diff --git a/Zend/tests/bug78010.phpt b/Zend/tests/gc/bug78010.phpt
similarity index 100%
rename from Zend/tests/bug78010.phpt
rename to Zend/tests/gc/bug78010.phpt
diff --git a/Zend/tests/bug78379.phpt b/Zend/tests/gc/bug78379.phpt
similarity index 100%
rename from Zend/tests/bug78379.phpt
rename to Zend/tests/gc/bug78379.phpt
diff --git a/Zend/tests/bug78379_2.phpt b/Zend/tests/gc/bug78379_2.phpt
similarity index 100%
rename from Zend/tests/bug78379_2.phpt
rename to Zend/tests/gc/bug78379_2.phpt
diff --git a/Zend/tests/bug78752.phpt b/Zend/tests/gc/bug78752.phpt
similarity index 100%
rename from Zend/tests/bug78752.phpt
rename to Zend/tests/gc/bug78752.phpt
diff --git a/Zend/tests/bug78999.phpt b/Zend/tests/gc/bug78999.phpt
similarity index 100%
rename from Zend/tests/bug78999.phpt
rename to Zend/tests/gc/bug78999.phpt
diff --git a/Zend/tests/bug79900.phpt b/Zend/tests/gc/bug79900.phpt
similarity index 100%
rename from Zend/tests/bug79900.phpt
rename to Zend/tests/gc/bug79900.phpt
diff --git a/Zend/tests/bug80072.phpt b/Zend/tests/gc/bug80072.phpt
similarity index 100%
rename from Zend/tests/bug80072.phpt
rename to Zend/tests/gc/bug80072.phpt
diff --git a/Zend/tests/bug35655.phpt b/Zend/tests/heredoc_nowdoc/bug35655.phpt
similarity index 100%
rename from Zend/tests/bug35655.phpt
rename to Zend/tests/heredoc_nowdoc/bug35655.phpt
diff --git a/Zend/tests/bug36037.phpt b/Zend/tests/heredoc_nowdoc/bug36037.phpt
similarity index 100%
rename from Zend/tests/bug36037.phpt
rename to Zend/tests/heredoc_nowdoc/bug36037.phpt
diff --git a/Zend/tests/bug44830.phpt b/Zend/tests/heredoc_nowdoc/bug44830.phpt
similarity index 100%
rename from Zend/tests/bug44830.phpt
rename to Zend/tests/heredoc_nowdoc/bug44830.phpt
diff --git a/Zend/tests/bug47516.phpt b/Zend/tests/heredoc_nowdoc/bug47516.phpt
similarity index 100%
rename from Zend/tests/bug47516.phpt
rename to Zend/tests/heredoc_nowdoc/bug47516.phpt
diff --git a/Zend/tests/bug79934.phpt b/Zend/tests/heredoc_nowdoc/bug79934.phpt
similarity index 100%
rename from Zend/tests/bug79934.phpt
rename to Zend/tests/heredoc_nowdoc/bug79934.phpt
diff --git a/Zend/tests/bug27598.phpt b/Zend/tests/list/bug27598.phpt
similarity index 100%
rename from Zend/tests/bug27598.phpt
rename to Zend/tests/list/bug27598.phpt
diff --git a/Zend/tests/bug39304.phpt b/Zend/tests/list/bug39304.phpt
similarity index 100%
rename from Zend/tests/bug39304.phpt
rename to Zend/tests/list/bug39304.phpt
diff --git a/Zend/tests/bug40899.phpt b/Zend/tests/list/bug40899.phpt
similarity index 100%
rename from Zend/tests/bug40899.phpt
rename to Zend/tests/list/bug40899.phpt
diff --git a/Zend/tests/bug65969.phpt b/Zend/tests/list/bug65969.phpt
similarity index 100%
rename from Zend/tests/bug65969.phpt
rename to Zend/tests/list/bug65969.phpt
diff --git a/Zend/tests/bug71030.phpt b/Zend/tests/list/bug71030.phpt
similarity index 100%
rename from Zend/tests/bug71030.phpt
rename to Zend/tests/list/bug71030.phpt
diff --git a/Zend/tests/bug72395.phpt b/Zend/tests/list/bug72395.phpt
similarity index 100%
rename from Zend/tests/bug72395.phpt
rename to Zend/tests/list/bug72395.phpt
diff --git a/Zend/tests/bug73663.phpt b/Zend/tests/list/bug73663.phpt
similarity index 100%
rename from Zend/tests/bug73663.phpt
rename to Zend/tests/list/bug73663.phpt
diff --git a/Zend/tests/bug73663_2.phpt b/Zend/tests/list/bug73663_2.phpt
similarity index 100%
rename from Zend/tests/bug73663_2.phpt
rename to Zend/tests/list/bug73663_2.phpt
diff --git a/Zend/tests/bug47699.phpt b/Zend/tests/lsb/bug47699.phpt
similarity index 100%
rename from Zend/tests/bug47699.phpt
rename to Zend/tests/lsb/bug47699.phpt
diff --git a/Zend/tests/bug19859.phpt b/Zend/tests/magic_methods/bug19859.phpt
similarity index 100%
rename from Zend/tests/bug19859.phpt
rename to Zend/tests/magic_methods/bug19859.phpt
diff --git a/Zend/tests/bug24635.phpt b/Zend/tests/magic_methods/bug24635.phpt
similarity index 100%
rename from Zend/tests/bug24635.phpt
rename to Zend/tests/magic_methods/bug24635.phpt
diff --git a/Zend/tests/bug26166.phpt b/Zend/tests/magic_methods/bug26166.phpt
similarity index 100%
rename from Zend/tests/bug26166.phpt
rename to Zend/tests/magic_methods/bug26166.phpt
diff --git a/Zend/tests/bug29368.phpt b/Zend/tests/magic_methods/bug29368.phpt
similarity index 100%
rename from Zend/tests/bug29368.phpt
rename to Zend/tests/magic_methods/bug29368.phpt
diff --git a/Zend/tests/bug29368_1.phpt b/Zend/tests/magic_methods/bug29368_1.phpt
similarity index 100%
rename from Zend/tests/bug29368_1.phpt
rename to Zend/tests/magic_methods/bug29368_1.phpt
diff --git a/Zend/tests/bug29368_2.phpt b/Zend/tests/magic_methods/bug29368_2.phpt
similarity index 100%
rename from Zend/tests/bug29368_2.phpt
rename to Zend/tests/magic_methods/bug29368_2.phpt
diff --git a/Zend/tests/bug29368_3.phpt b/Zend/tests/magic_methods/bug29368_3.phpt
similarity index 100%
rename from Zend/tests/bug29368_3.phpt
rename to Zend/tests/magic_methods/bug29368_3.phpt
diff --git a/Zend/tests/bug30394.phpt b/Zend/tests/magic_methods/bug30394.phpt
similarity index 100%
rename from Zend/tests/bug30394.phpt
rename to Zend/tests/magic_methods/bug30394.phpt
diff --git a/Zend/tests/bug30791.phpt b/Zend/tests/magic_methods/bug30791.phpt
similarity index 100%
rename from Zend/tests/bug30791.phpt
rename to Zend/tests/magic_methods/bug30791.phpt
diff --git a/Zend/tests/bug31683.phpt b/Zend/tests/magic_methods/bug31683.phpt
similarity index 100%
rename from Zend/tests/bug31683.phpt
rename to Zend/tests/magic_methods/bug31683.phpt
diff --git a/Zend/tests/bug32596.phpt b/Zend/tests/magic_methods/bug32596.phpt
similarity index 100%
rename from Zend/tests/bug32596.phpt
rename to Zend/tests/magic_methods/bug32596.phpt
diff --git a/Zend/tests/bug32660.phpt b/Zend/tests/magic_methods/bug32660.phpt
similarity index 100%
rename from Zend/tests/bug32660.phpt
rename to Zend/tests/magic_methods/bug32660.phpt
diff --git a/Zend/tests/bug36006.phpt b/Zend/tests/magic_methods/bug36006.phpt
similarity index 100%
rename from Zend/tests/bug36006.phpt
rename to Zend/tests/magic_methods/bug36006.phpt
diff --git a/Zend/tests/bug36214.phpt b/Zend/tests/magic_methods/bug36214.phpt
similarity index 100%
rename from Zend/tests/bug36214.phpt
rename to Zend/tests/magic_methods/bug36214.phpt
diff --git a/Zend/tests/bug36268.phpt b/Zend/tests/magic_methods/bug36268.phpt
similarity index 100%
rename from Zend/tests/bug36268.phpt
rename to Zend/tests/magic_methods/bug36268.phpt
diff --git a/Zend/tests/bug36759.phpt b/Zend/tests/magic_methods/bug36759.phpt
similarity index 100%
rename from Zend/tests/bug36759.phpt
rename to Zend/tests/magic_methods/bug36759.phpt
diff --git a/Zend/tests/bug37667.phpt b/Zend/tests/magic_methods/bug37667.phpt
similarity index 100%
rename from Zend/tests/bug37667.phpt
rename to Zend/tests/magic_methods/bug37667.phpt
diff --git a/Zend/tests/bug37707.phpt b/Zend/tests/magic_methods/bug37707.phpt
similarity index 100%
rename from Zend/tests/bug37707.phpt
rename to Zend/tests/magic_methods/bug37707.phpt
diff --git a/Zend/tests/bug38146.phpt b/Zend/tests/magic_methods/bug38146.phpt
similarity index 100%
rename from Zend/tests/bug38146.phpt
rename to Zend/tests/magic_methods/bug38146.phpt
diff --git a/Zend/tests/bug38234.phpt b/Zend/tests/magic_methods/bug38234.phpt
similarity index 100%
rename from Zend/tests/bug38234.phpt
rename to Zend/tests/magic_methods/bug38234.phpt
diff --git a/Zend/tests/bug38461.phpt b/Zend/tests/magic_methods/bug38461.phpt
similarity index 100%
rename from Zend/tests/bug38461.phpt
rename to Zend/tests/magic_methods/bug38461.phpt
diff --git a/Zend/tests/bug38624.phpt b/Zend/tests/magic_methods/bug38624.phpt
similarity index 100%
rename from Zend/tests/bug38624.phpt
rename to Zend/tests/magic_methods/bug38624.phpt
diff --git a/Zend/tests/bug42937.phpt b/Zend/tests/magic_methods/bug42937.phpt
similarity index 100%
rename from Zend/tests/bug42937.phpt
rename to Zend/tests/magic_methods/bug42937.phpt
diff --git a/Zend/tests/bug43175.phpt b/Zend/tests/magic_methods/bug43175.phpt
similarity index 100%
rename from Zend/tests/bug43175.phpt
rename to Zend/tests/magic_methods/bug43175.phpt
diff --git a/Zend/tests/bug43201.phpt b/Zend/tests/magic_methods/bug43201.phpt
similarity index 100%
rename from Zend/tests/bug43201.phpt
rename to Zend/tests/magic_methods/bug43201.phpt
diff --git a/Zend/tests/bug44899.phpt b/Zend/tests/magic_methods/bug44899.phpt
similarity index 100%
rename from Zend/tests/bug44899.phpt
rename to Zend/tests/magic_methods/bug44899.phpt
diff --git a/Zend/tests/bug44899_2.phpt b/Zend/tests/magic_methods/bug44899_2.phpt
similarity index 100%
rename from Zend/tests/bug44899_2.phpt
rename to Zend/tests/magic_methods/bug44899_2.phpt
diff --git a/Zend/tests/bug45186.phpt b/Zend/tests/magic_methods/bug45186.phpt
similarity index 100%
rename from Zend/tests/bug45186.phpt
rename to Zend/tests/magic_methods/bug45186.phpt
diff --git a/Zend/tests/bug45186_2.phpt b/Zend/tests/magic_methods/bug45186_2.phpt
similarity index 100%
rename from Zend/tests/bug45186_2.phpt
rename to Zend/tests/magic_methods/bug45186_2.phpt
diff --git a/Zend/tests/bug47801.phpt b/Zend/tests/magic_methods/bug47801.phpt
similarity index 100%
rename from Zend/tests/bug47801.phpt
rename to Zend/tests/magic_methods/bug47801.phpt
diff --git a/Zend/tests/bug48248.phpt b/Zend/tests/magic_methods/bug48248.phpt
similarity index 100%
rename from Zend/tests/bug48248.phpt
rename to Zend/tests/magic_methods/bug48248.phpt
diff --git a/Zend/tests/bug48533.phpt b/Zend/tests/magic_methods/bug48533.phpt
similarity index 100%
rename from Zend/tests/bug48533.phpt
rename to Zend/tests/magic_methods/bug48533.phpt
diff --git a/Zend/tests/bug50394.phpt b/Zend/tests/magic_methods/bug50394.phpt
similarity index 100%
rename from Zend/tests/bug50394.phpt
rename to Zend/tests/magic_methods/bug50394.phpt
diff --git a/Zend/tests/bug52361.phpt b/Zend/tests/magic_methods/bug52361.phpt
similarity index 100%
rename from Zend/tests/bug52361.phpt
rename to Zend/tests/magic_methods/bug52361.phpt
diff --git a/Zend/tests/bug52484.phpt b/Zend/tests/magic_methods/bug52484.phpt
similarity index 100%
rename from Zend/tests/bug52484.phpt
rename to Zend/tests/magic_methods/bug52484.phpt
diff --git a/Zend/tests/bug52484_2.phpt b/Zend/tests/magic_methods/bug52484_2.phpt
similarity index 100%
rename from Zend/tests/bug52484_2.phpt
rename to Zend/tests/magic_methods/bug52484_2.phpt
diff --git a/Zend/tests/bug52484_3.phpt b/Zend/tests/magic_methods/bug52484_3.phpt
similarity index 100%
rename from Zend/tests/bug52484_3.phpt
rename to Zend/tests/magic_methods/bug52484_3.phpt
diff --git a/Zend/tests/bug53826.phpt b/Zend/tests/magic_methods/bug53826.phpt
similarity index 100%
rename from Zend/tests/bug53826.phpt
rename to Zend/tests/magic_methods/bug53826.phpt
diff --git a/Zend/tests/bug54372.phpt b/Zend/tests/magic_methods/bug54372.phpt
similarity index 100%
rename from Zend/tests/bug54372.phpt
rename to Zend/tests/magic_methods/bug54372.phpt
diff --git a/Zend/tests/bug61782.phpt b/Zend/tests/magic_methods/bug61782.phpt
similarity index 100%
rename from Zend/tests/bug61782.phpt
rename to Zend/tests/magic_methods/bug61782.phpt
diff --git a/Zend/tests/bug68412.phpt b/Zend/tests/magic_methods/bug68412.phpt
similarity index 100%
rename from Zend/tests/bug68412.phpt
rename to Zend/tests/magic_methods/bug68412.phpt
diff --git a/Zend/tests/bug68652.phpt b/Zend/tests/magic_methods/bug68652.phpt
similarity index 100%
rename from Zend/tests/bug68652.phpt
rename to Zend/tests/magic_methods/bug68652.phpt
diff --git a/Zend/tests/bug69025.phpt b/Zend/tests/magic_methods/bug69025.phpt
similarity index 100%
rename from Zend/tests/bug69025.phpt
rename to Zend/tests/magic_methods/bug69025.phpt
diff --git a/Zend/tests/bug69427.phpt b/Zend/tests/magic_methods/bug69427.phpt
similarity index 100%
rename from Zend/tests/bug69427.phpt
rename to Zend/tests/magic_methods/bug69427.phpt
diff --git a/Zend/tests/bug70321.phpt b/Zend/tests/magic_methods/bug70321.phpt
similarity index 100%
rename from Zend/tests/bug70321.phpt
rename to Zend/tests/magic_methods/bug70321.phpt
diff --git a/Zend/tests/bug72813.phpt b/Zend/tests/magic_methods/bug72813.phpt
similarity index 100%
rename from Zend/tests/bug72813.phpt
rename to Zend/tests/magic_methods/bug72813.phpt
diff --git a/Zend/tests/bug74340.phpt b/Zend/tests/magic_methods/bug74340.phpt
similarity index 100%
rename from Zend/tests/bug74340.phpt
rename to Zend/tests/magic_methods/bug74340.phpt
diff --git a/Zend/tests/bug74862.phpt b/Zend/tests/magic_methods/bug74862.phpt
similarity index 100%
rename from Zend/tests/bug74862.phpt
rename to Zend/tests/magic_methods/bug74862.phpt
diff --git a/Zend/tests/bug74862_2.phpt b/Zend/tests/magic_methods/bug74862_2.phpt
similarity index 100%
rename from Zend/tests/bug74862_2.phpt
rename to Zend/tests/magic_methods/bug74862_2.phpt
diff --git a/Zend/tests/bug75420.1.phpt b/Zend/tests/magic_methods/bug75420.1.phpt
similarity index 100%
rename from Zend/tests/bug75420.1.phpt
rename to Zend/tests/magic_methods/bug75420.1.phpt
diff --git a/Zend/tests/bug75420.10.phpt b/Zend/tests/magic_methods/bug75420.10.phpt
similarity index 100%
rename from Zend/tests/bug75420.10.phpt
rename to Zend/tests/magic_methods/bug75420.10.phpt
diff --git a/Zend/tests/bug75420.11.phpt b/Zend/tests/magic_methods/bug75420.11.phpt
similarity index 100%
rename from Zend/tests/bug75420.11.phpt
rename to Zend/tests/magic_methods/bug75420.11.phpt
diff --git a/Zend/tests/bug75420.12.phpt b/Zend/tests/magic_methods/bug75420.12.phpt
similarity index 100%
rename from Zend/tests/bug75420.12.phpt
rename to Zend/tests/magic_methods/bug75420.12.phpt
diff --git a/Zend/tests/bug75420.13.phpt b/Zend/tests/magic_methods/bug75420.13.phpt
similarity index 100%
rename from Zend/tests/bug75420.13.phpt
rename to Zend/tests/magic_methods/bug75420.13.phpt
diff --git a/Zend/tests/bug75420.14.phpt b/Zend/tests/magic_methods/bug75420.14.phpt
similarity index 100%
rename from Zend/tests/bug75420.14.phpt
rename to Zend/tests/magic_methods/bug75420.14.phpt
diff --git a/Zend/tests/bug75420.15.phpt b/Zend/tests/magic_methods/bug75420.15.phpt
similarity index 100%
rename from Zend/tests/bug75420.15.phpt
rename to Zend/tests/magic_methods/bug75420.15.phpt
diff --git a/Zend/tests/bug75420.16.phpt b/Zend/tests/magic_methods/bug75420.16.phpt
similarity index 100%
rename from Zend/tests/bug75420.16.phpt
rename to Zend/tests/magic_methods/bug75420.16.phpt
diff --git a/Zend/tests/bug75420.2.phpt b/Zend/tests/magic_methods/bug75420.2.phpt
similarity index 100%
rename from Zend/tests/bug75420.2.phpt
rename to Zend/tests/magic_methods/bug75420.2.phpt
diff --git a/Zend/tests/bug75420.3.phpt b/Zend/tests/magic_methods/bug75420.3.phpt
similarity index 100%
rename from Zend/tests/bug75420.3.phpt
rename to Zend/tests/magic_methods/bug75420.3.phpt
diff --git a/Zend/tests/bug75420.4.phpt b/Zend/tests/magic_methods/bug75420.4.phpt
similarity index 100%
rename from Zend/tests/bug75420.4.phpt
rename to Zend/tests/magic_methods/bug75420.4.phpt
diff --git a/Zend/tests/bug75420.5.phpt b/Zend/tests/magic_methods/bug75420.5.phpt
similarity index 100%
rename from Zend/tests/bug75420.5.phpt
rename to Zend/tests/magic_methods/bug75420.5.phpt
diff --git a/Zend/tests/bug75420.6.phpt b/Zend/tests/magic_methods/bug75420.6.phpt
similarity index 100%
rename from Zend/tests/bug75420.6.phpt
rename to Zend/tests/magic_methods/bug75420.6.phpt
diff --git a/Zend/tests/bug75420.7.phpt b/Zend/tests/magic_methods/bug75420.7.phpt
similarity index 100%
rename from Zend/tests/bug75420.7.phpt
rename to Zend/tests/magic_methods/bug75420.7.phpt
diff --git a/Zend/tests/bug75420.8.phpt b/Zend/tests/magic_methods/bug75420.8.phpt
similarity index 100%
rename from Zend/tests/bug75420.8.phpt
rename to Zend/tests/magic_methods/bug75420.8.phpt
diff --git a/Zend/tests/bug75420.9.phpt b/Zend/tests/magic_methods/bug75420.9.phpt
similarity index 100%
rename from Zend/tests/bug75420.9.phpt
rename to Zend/tests/magic_methods/bug75420.9.phpt
diff --git a/Zend/tests/bug75420.phpt b/Zend/tests/magic_methods/bug75420.phpt
similarity index 100%
rename from Zend/tests/bug75420.phpt
rename to Zend/tests/magic_methods/bug75420.phpt
diff --git a/Zend/tests/bug76667.phpt b/Zend/tests/magic_methods/bug76667.phpt
similarity index 100%
rename from Zend/tests/bug76667.phpt
rename to Zend/tests/magic_methods/bug76667.phpt
diff --git a/Zend/tests/bug77291.phpt b/Zend/tests/magic_methods/bug77291.phpt
similarity index 100%
rename from Zend/tests/bug77291.phpt
rename to Zend/tests/magic_methods/bug77291.phpt
diff --git a/Zend/tests/bug77339.phpt b/Zend/tests/magic_methods/bug77339.phpt
similarity index 100%
rename from Zend/tests/bug77339.phpt
rename to Zend/tests/magic_methods/bug77339.phpt
diff --git a/Zend/tests/bug80096.phpt b/Zend/tests/named_params/bug80096.phpt
similarity index 100%
rename from Zend/tests/bug80096.phpt
rename to Zend/tests/named_params/bug80096.phpt
diff --git a/Zend/tests/bug42802.phpt b/Zend/tests/namespaces/bug42802.phpt
similarity index 100%
rename from Zend/tests/bug42802.phpt
rename to Zend/tests/namespaces/bug42802.phpt
diff --git a/Zend/tests/bug42819.phpt b/Zend/tests/namespaces/bug42819.phpt
similarity index 100%
rename from Zend/tests/bug42819.phpt
rename to Zend/tests/namespaces/bug42819.phpt
diff --git a/Zend/tests/bug46813.phpt b/Zend/tests/namespaces/bug46813.phpt
similarity index 100%
rename from Zend/tests/bug46813.phpt
rename to Zend/tests/namespaces/bug46813.phpt
diff --git a/Zend/tests/bug47593.phpt b/Zend/tests/namespaces/bug47593.phpt
similarity index 100%
rename from Zend/tests/bug47593.phpt
rename to Zend/tests/namespaces/bug47593.phpt
diff --git a/Zend/tests/bug48912.phpt b/Zend/tests/namespaces/bug48912.phpt
similarity index 100%
rename from Zend/tests/bug48912.phpt
rename to Zend/tests/namespaces/bug48912.phpt
diff --git a/Zend/tests/bug77376.phpt b/Zend/tests/namespaces/bug77376.phpt
similarity index 100%
rename from Zend/tests/bug77376.phpt
rename to Zend/tests/namespaces/bug77376.phpt
diff --git a/Zend/tests/bug81216.phpt b/Zend/tests/nullsafe_operator/bug81216.phpt
similarity index 100%
rename from Zend/tests/bug81216.phpt
rename to Zend/tests/nullsafe_operator/bug81216.phpt
diff --git a/Zend/tests/bug81216_2.phpt b/Zend/tests/nullsafe_operator/bug81216_2.phpt
similarity index 100%
rename from Zend/tests/bug81216_2.phpt
rename to Zend/tests/nullsafe_operator/bug81216_2.phpt
diff --git a/Zend/tests/bug69767.phpt b/Zend/tests/parameter_default_values/bug69767.phpt
similarity index 100%
rename from Zend/tests/bug69767.phpt
rename to Zend/tests/parameter_default_values/bug69767.phpt
diff --git a/Zend/tests/bug53748.phpt b/Zend/tests/traits/bug53748.phpt
similarity index 100%
rename from Zend/tests/bug53748.phpt
rename to Zend/tests/traits/bug53748.phpt
diff --git a/Zend/tests/bug55086.phpt b/Zend/tests/traits/bug55086.phpt
similarity index 100%
rename from Zend/tests/bug55086.phpt
rename to Zend/tests/traits/bug55086.phpt
diff --git a/Zend/tests/bug62069.phpt b/Zend/tests/traits/bug62069.phpt
similarity index 100%
rename from Zend/tests/bug62069.phpt
rename to Zend/tests/traits/bug62069.phpt
diff --git a/Zend/tests/bug62069_2.phpt b/Zend/tests/traits/bug62069_2.phpt
similarity index 100%
rename from Zend/tests/bug62069_2.phpt
rename to Zend/tests/traits/bug62069_2.phpt
diff --git a/Zend/tests/bug62358.phpt b/Zend/tests/traits/bug62358.phpt
similarity index 100%
rename from Zend/tests/bug62358.phpt
rename to Zend/tests/traits/bug62358.phpt
diff --git a/Zend/tests/bug62907.phpt b/Zend/tests/traits/bug62907.phpt
similarity index 100%
rename from Zend/tests/bug62907.phpt
rename to Zend/tests/traits/bug62907.phpt
diff --git a/Zend/tests/bug63219.phpt b/Zend/tests/traits/bug63219.phpt
similarity index 100%
rename from Zend/tests/bug63219.phpt
rename to Zend/tests/traits/bug63219.phpt
diff --git a/Zend/tests/bug63305.phpt b/Zend/tests/traits/bug63305.phpt
similarity index 100%
rename from Zend/tests/bug63305.phpt
rename to Zend/tests/traits/bug63305.phpt
diff --git a/Zend/tests/bug65419.phpt b/Zend/tests/traits/bug65419.phpt
similarity index 100%
rename from Zend/tests/bug65419.phpt
rename to Zend/tests/traits/bug65419.phpt
diff --git a/Zend/tests/bug65579.phpt b/Zend/tests/traits/bug65579.phpt
similarity index 100%
rename from Zend/tests/bug65579.phpt
rename to Zend/tests/traits/bug65579.phpt
diff --git a/Zend/tests/bug69084.phpt b/Zend/tests/traits/bug69084.phpt
similarity index 100%
rename from Zend/tests/bug69084.phpt
rename to Zend/tests/traits/bug69084.phpt
diff --git a/Zend/tests/bug69174.phpt b/Zend/tests/traits/bug69174.phpt
similarity index 100%
rename from Zend/tests/bug69174.phpt
rename to Zend/tests/traits/bug69174.phpt
diff --git a/Zend/tests/bug69467.phpt b/Zend/tests/traits/bug69467.phpt
similarity index 100%
rename from Zend/tests/bug69467.phpt
rename to Zend/tests/traits/bug69467.phpt
diff --git a/Zend/tests/bug70958.phpt b/Zend/tests/traits/bug70958.phpt
similarity index 100%
rename from Zend/tests/bug70958.phpt
rename to Zend/tests/traits/bug70958.phpt
diff --git a/Zend/tests/bug71275.phpt b/Zend/tests/traits/bug71275.phpt
similarity index 100%
rename from Zend/tests/bug71275.phpt
rename to Zend/tests/traits/bug71275.phpt
diff --git a/Zend/tests/bug74269.phpt b/Zend/tests/traits/bug74269.phpt
similarity index 100%
rename from Zend/tests/bug74269.phpt
rename to Zend/tests/traits/bug74269.phpt
diff --git a/Zend/tests/bug77966.phpt b/Zend/tests/traits/bug77966.phpt
similarity index 100%
rename from Zend/tests/bug77966.phpt
rename to Zend/tests/traits/bug77966.phpt
diff --git a/Zend/tests/bug78776.phpt b/Zend/tests/traits/bug78776.phpt
similarity index 100%
rename from Zend/tests/bug78776.phpt
rename to Zend/tests/traits/bug78776.phpt
diff --git a/Zend/tests/bug78787.phpt b/Zend/tests/traits/bug78787.phpt
similarity index 100%
rename from Zend/tests/bug78787.phpt
rename to Zend/tests/traits/bug78787.phpt
diff --git a/Zend/tests/bug80055.phpt b/Zend/tests/traits/bug80055.phpt
similarity index 100%
rename from Zend/tests/bug80055.phpt
rename to Zend/tests/traits/bug80055.phpt
diff --git a/Zend/tests/bug81192.phpt b/Zend/tests/traits/bug81192.phpt
similarity index 100%
rename from Zend/tests/bug81192.phpt
rename to Zend/tests/traits/bug81192.phpt
diff --git a/Zend/tests/bug81192_trait.inc b/Zend/tests/traits/bug81192_trait.inc
similarity index 100%
rename from Zend/tests/bug81192_trait.inc
rename to Zend/tests/traits/bug81192_trait.inc
diff --git a/Zend/tests/bug72188.phpt b/Zend/tests/try/bug72188.phpt
similarity index 100%
rename from Zend/tests/bug72188.phpt
rename to Zend/tests/try/bug72188.phpt
diff --git a/Zend/tests/bug72215.phpt b/Zend/tests/try/bug72215.phpt
similarity index 100%
rename from Zend/tests/bug72215.phpt
rename to Zend/tests/try/bug72215.phpt
diff --git a/Zend/tests/bug72215_1.phpt b/Zend/tests/try/bug72215_1.phpt
similarity index 100%
rename from Zend/tests/bug72215_1.phpt
rename to Zend/tests/try/bug72215_1.phpt
diff --git a/Zend/tests/bug72215_2.phpt b/Zend/tests/try/bug72215_2.phpt
similarity index 100%
rename from Zend/tests/bug72215_2.phpt
rename to Zend/tests/try/bug72215_2.phpt
diff --git a/Zend/tests/bug72215_3.phpt b/Zend/tests/try/bug72215_3.phpt
similarity index 100%
rename from Zend/tests/bug72215_3.phpt
rename to Zend/tests/try/bug72215_3.phpt
diff --git a/Zend/tests/bug72216.phpt b/Zend/tests/try/bug72216.phpt
similarity index 100%
rename from Zend/tests/bug72216.phpt
rename to Zend/tests/try/bug72216.phpt
diff --git a/Zend/tests/bug73337.phpt b/Zend/tests/try/bug73337.phpt
similarity index 100%
rename from Zend/tests/bug73337.phpt
rename to Zend/tests/try/bug73337.phpt
diff --git a/Zend/tests/bug43332_1.phpt b/Zend/tests/typehints/bug43332_1.phpt
similarity index 100%
rename from Zend/tests/bug43332_1.phpt
rename to Zend/tests/typehints/bug43332_1.phpt
diff --git a/Zend/tests/bug43332_2.phpt b/Zend/tests/typehints/bug43332_2.phpt
similarity index 100%
rename from Zend/tests/bug43332_2.phpt
rename to Zend/tests/typehints/bug43332_2.phpt
diff --git a/Zend/tests/bug60573.phpt b/Zend/tests/typehints/bug60573.phpt
similarity index 100%
rename from Zend/tests/bug60573.phpt
rename to Zend/tests/typehints/bug60573.phpt
diff --git a/Zend/tests/bug60573_2.phpt b/Zend/tests/typehints/bug60573_2.phpt
similarity index 100%
rename from Zend/tests/bug60573_2.phpt
rename to Zend/tests/typehints/bug60573_2.phpt
diff --git a/Zend/tests/bug62441.phpt b/Zend/tests/typehints/bug62441.phpt
similarity index 100%
rename from Zend/tests/bug62441.phpt
rename to Zend/tests/typehints/bug62441.phpt
diff --git a/Zend/tests/bug24773.phpt b/Zend/tests/unset/bug24773.phpt
similarity index 100%
rename from Zend/tests/bug24773.phpt
rename to Zend/tests/unset/bug24773.phpt
diff --git a/Zend/tests/bug33512.phpt b/Zend/tests/unset/bug33512.phpt
similarity index 100%
rename from Zend/tests/bug33512.phpt
rename to Zend/tests/unset/bug33512.phpt
diff --git a/Zend/tests/bug34518.phpt b/Zend/tests/unset/bug34518.phpt
similarity index 100%
rename from Zend/tests/bug34518.phpt
rename to Zend/tests/unset/bug34518.phpt
diff --git a/Zend/tests/bug39346.phpt b/Zend/tests/unset/bug39346.phpt
similarity index 100%
rename from Zend/tests/bug39346.phpt
rename to Zend/tests/unset/bug39346.phpt
diff --git a/Zend/tests/bug40833.phpt b/Zend/tests/unset/bug40833.phpt
similarity index 100%
rename from Zend/tests/bug40833.phpt
rename to Zend/tests/unset/bug40833.phpt
diff --git a/Zend/tests/bug62653.phpt b/Zend/tests/unset/bug62653.phpt
similarity index 100%
rename from Zend/tests/bug62653.phpt
rename to Zend/tests/unset/bug62653.phpt
diff --git a/Zend/tests/bug68370.phpt b/Zend/tests/unset/bug68370.phpt
similarity index 100%
rename from Zend/tests/bug68370.phpt
rename to Zend/tests/unset/bug68370.phpt
diff --git a/Zend/tests/bug70240.phpt b/Zend/tests/unset/bug70240.phpt
similarity index 100%
rename from Zend/tests/bug70240.phpt
rename to Zend/tests/unset/bug70240.phpt
diff --git a/Zend/tests/bug81377.phpt b/Zend/tests/unset/bug81377.phpt
similarity index 100%
rename from Zend/tests/bug81377.phpt
rename to Zend/tests/unset/bug81377.phpt