diff --git a/Zend/tests/bug21478.phpt b/ext/standard/tests/filters/bug21478.phpt
similarity index 100%
rename from Zend/tests/bug21478.phpt
rename to ext/standard/tests/filters/bug21478.phpt
diff --git a/ext/standard/tests/file/bug39551.phpt b/ext/standard/tests/filters/bug39551.phpt
similarity index 100%
rename from ext/standard/tests/file/bug39551.phpt
rename to ext/standard/tests/filters/bug39551.phpt
diff --git a/ext/standard/tests/streams/bug77069.phpt b/ext/standard/tests/filters/bug77069.phpt
similarity index 100%
rename from ext/standard/tests/streams/bug77069.phpt
rename to ext/standard/tests/filters/bug77069.phpt
diff --git a/ext/standard/tests/streams/bug77080.phpt b/ext/standard/tests/filters/bug77080.phpt
similarity index 100%
rename from ext/standard/tests/streams/bug77080.phpt
rename to ext/standard/tests/filters/bug77080.phpt
diff --git a/Zend/tests/bug78406.phpt b/ext/standard/tests/filters/bug78406.phpt
similarity index 100%
rename from Zend/tests/bug78406.phpt
rename to ext/standard/tests/filters/bug78406.phpt
diff --git a/ext/standard/tests/streams/bug78506.phpt b/ext/standard/tests/filters/bug78506.phpt
similarity index 100%
rename from ext/standard/tests/streams/bug78506.phpt
rename to ext/standard/tests/filters/bug78506.phpt
diff --git a/ext/standard/tests/streams/bug79984.phpt b/ext/standard/tests/filters/bug79984.phpt
similarity index 100%
rename from ext/standard/tests/streams/bug79984.phpt
rename to ext/standard/tests/filters/bug79984.phpt
diff --git a/ext/standard/tests/streams/gh17650.phpt b/ext/standard/tests/filters/gh17650.phpt
similarity index 100%
rename from ext/standard/tests/streams/gh17650.phpt
rename to ext/standard/tests/filters/gh17650.phpt
diff --git a/ext/standard/tests/streams/stream_filter_register.phpt b/ext/standard/tests/filters/stream_filter_register.phpt
similarity index 100%
rename from ext/standard/tests/streams/stream_filter_register.phpt
rename to ext/standard/tests/filters/stream_filter_register.phpt
diff --git a/ext/standard/tests/streams/stream_multi_filters_close.phpt b/ext/standard/tests/filters/stream_multi_filters_close.phpt
similarity index 100%
rename from ext/standard/tests/streams/stream_multi_filters_close.phpt
rename to ext/standard/tests/filters/stream_multi_filters_close.phpt
diff --git a/ext/standard/tests/streams/user_streams_consumed_bug.phpt b/ext/standard/tests/filters/user_streams_consumed_bug.phpt
similarity index 100%
rename from ext/standard/tests/streams/user_streams_consumed_bug.phpt
rename to ext/standard/tests/filters/user_streams_consumed_bug.phpt
diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/filters/userfilters.phpt
similarity index 100%
rename from ext/standard/tests/file/userfilters.phpt
rename to ext/standard/tests/filters/userfilters.phpt