diff --git a/tests/functional/acp_groups_test.php b/tests/functional/acp_groups_test.php
index cdf8bf5117..4eb4747572 100644
--- a/tests/functional/acp_groups_test.php
+++ b/tests/functional/acp_groups_test.php

diff --git a/tests/functional/acp_permissions_test.php b/tests/functional/acp_permissions_test.php
index e17f33dc96..0a40e76057 100644
--- a/tests/functional/acp_permissions_test.php
+++ b/tests/functional/acp_permissions_test.php

diff --git a/tests/functional/acp_users_test.php b/tests/functional/acp_users_test.php
index 50d9a67dc1..78028aacb8 100644
--- a/tests/functional/acp_users_test.php
+++ b/tests/functional/acp_users_test.php

diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index d3fed18094..b4b4279bf1 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php

diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php
index 5f767b44f2..35f7956252 100644
--- a/tests/functional/avatar_acp_groups_test.php
+++ b/tests/functional/avatar_acp_groups_test.php

diff --git a/tests/functional/avatar_acp_users_test.php b/tests/functional/avatar_acp_users_test.php
index 0afd05e530..38e001f516 100644
--- a/tests/functional/avatar_acp_users_test.php
+++ b/tests/functional/avatar_acp_users_test.php

diff --git a/tests/functional/avatar_ucp_groups_test.php b/tests/functional/avatar_ucp_groups_test.php
index 233b7d36e1..fddf66933f 100644
--- a/tests/functional/avatar_ucp_groups_test.php
+++ b/tests/functional/avatar_ucp_groups_test.php

diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php
index f828559e0d..62cd79c307 100644
--- a/tests/functional/avatar_ucp_users_test.php
+++ b/tests/functional/avatar_ucp_users_test.php

diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index c3be301762..b9e74a280f 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php

diff --git a/tests/functional/common_avatar_test.php b/tests/functional/common_avatar_test.php
index 1fd8f2ed6f..1bb9e5cd8e 100644
--- a/tests/functional/common_avatar_test.php
+++ b/tests/functional/common_avatar_test.php

diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index 950db24767..748d4d5e0a 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php

diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php
index 087250157d..dbf197fcfa 100644
--- a/tests/functional/download_test.php
+++ b/tests/functional/download_test.php

diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 8a724f2133..8f0f9c6700 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 57b0f56bee..532a160a47 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php

diff --git a/tests/functional/extension_global_lang_test.php b/tests/functional/extension_global_lang_test.php
index 094eda8257..53bb9af5ca 100644
--- a/tests/functional/extension_global_lang_test.php
+++ b/tests/functional/extension_global_lang_test.php

diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php
index ba025d582e..ee084720e4 100644
--- a/tests/functional/extension_module_test.php
+++ b/tests/functional/extension_module_test.php

diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
index e922abdaf1..92d8d596c7 100644
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php

diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index 86d3930a7b..a474ecf27f 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php

diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index 30f6fd7b47..cf36a0523f 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php

diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
index 65c4b6b7c4..f904258a5c 100644
--- a/tests/functional/fileupload_remote_test.php
+++ b/tests/functional/fileupload_remote_test.php

diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php
index 2ad6d08503..ec378e0e75 100644
--- a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php
+++ b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php

diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php
index c59b3c6820..ee797c718d 100644
--- a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php
+++ b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php

diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission.php b/tests/functional/fixtures/ext/foo/bar/event/permission.php
index 9b319dd35f..cdbdf40465 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/permission.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/permission.php

diff --git a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
index 8fa7ac97da..3a60019f68 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php

diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
index 2ba37f3050..d34244f800 100644
--- a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
+++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php

diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php
index cd3dacc9db..f1cd03f4ab 100644
--- a/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php
+++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php

diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php
index 3b6fd15d02..64fa19557f 100644
--- a/tests/functional/forgot_password_test.php
+++ b/tests/functional/forgot_password_test.php

diff --git a/tests/functional/forum_password_test.php b/tests/functional/forum_password_test.php
index 40a8059ad1..4b2b69a92c 100644
--- a/tests/functional/forum_password_test.php
+++ b/tests/functional/forum_password_test.php

diff --git a/tests/functional/forum_style_test.php b/tests/functional/forum_style_test.php
index 59f7341eb6..65be94f4d0 100644
--- a/tests/functional/forum_style_test.php
+++ b/tests/functional/forum_style_test.php

diff --git a/tests/functional/group_create_test.php b/tests/functional/group_create_test.php
index 96780069f7..a1417b5ba0 100644
--- a/tests/functional/group_create_test.php
+++ b/tests/functional/group_create_test.php

diff --git a/tests/functional/jumpbox_test.php b/tests/functional/jumpbox_test.php
index b987d2b99b..9eddcb6bf6 100644
--- a/tests/functional/jumpbox_test.php
+++ b/tests/functional/jumpbox_test.php

diff --git a/tests/functional/lang_test.php b/tests/functional/lang_test.php
index 053806a431..7cffd0ef61 100644
--- a/tests/functional/lang_test.php
+++ b/tests/functional/lang_test.php

diff --git a/tests/functional/mcp_test.php b/tests/functional/mcp_test.php
index f65a7d0784..e4d950ef34 100644
--- a/tests/functional/mcp_test.php
+++ b/tests/functional/mcp_test.php

diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index b7f7a1823d..c76ba6e37d 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php

diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php
index ac08a44e30..020e9cd142 100644
--- a/tests/functional/metadata_manager_test.php
+++ b/tests/functional/metadata_manager_test.php

diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
index 18e8a4ecc0..e4a960f862 100644
--- a/tests/functional/notification_test.php
+++ b/tests/functional/notification_test.php

diff --git a/tests/functional/paging_test.php b/tests/functional/paging_test.php
index b0e4743d5b..97ce822fdf 100644
--- a/tests/functional/paging_test.php
+++ b/tests/functional/paging_test.php

diff --git a/tests/functional/plupload_test.php b/tests/functional/plupload_test.php
index a91e70c7bb..ee71597ffc 100644
--- a/tests/functional/plupload_test.php
+++ b/tests/functional/plupload_test.php

diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index dd95704952..2611ef7bf1 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php

diff --git a/tests/functional/prune_shadow_topic_test.php b/tests/functional/prune_shadow_topic_test.php
index a9fd2457bb..84f07e9802 100644
--- a/tests/functional/prune_shadow_topic_test.php
+++ b/tests/functional/prune_shadow_topic_test.php

diff --git a/tests/functional/registration_test.php b/tests/functional/registration_test.php
index 5baf33c59e..45a684db19 100644
--- a/tests/functional/registration_test.php
+++ b/tests/functional/registration_test.php

diff --git a/tests/functional/report_post_captcha_test.php b/tests/functional/report_post_captcha_test.php
index 8283465041..93a03bd931 100644
--- a/tests/functional/report_post_captcha_test.php
+++ b/tests/functional/report_post_captcha_test.php

diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php
index 0bd9bf01ab..1d37d748df 100644
--- a/tests/functional/search/base.php
+++ b/tests/functional/search/base.php

diff --git a/tests/functional/search/mysql_test.php b/tests/functional/search/mysql_test.php
index 52a7b14f40..a97b12e905 100644
--- a/tests/functional/search/mysql_test.php
+++ b/tests/functional/search/mysql_test.php

diff --git a/tests/functional/search/native_test.php b/tests/functional/search/native_test.php
index 512c6f2830..9908b9cdaa 100644
--- a/tests/functional/search/native_test.php
+++ b/tests/functional/search/native_test.php

diff --git a/tests/functional/search/postgres_test.php b/tests/functional/search/postgres_test.php
index 974b417659..a76cc13493 100644
--- a/tests/functional/search/postgres_test.php
+++ b/tests/functional/search/postgres_test.php

diff --git a/tests/functional/search/sphinx_test.php b/tests/functional/search/sphinx_test.php
index ef2522f9ed..4bf1ab0e16 100644
--- a/tests/functional/search/sphinx_test.php
+++ b/tests/functional/search/sphinx_test.php

diff --git a/tests/functional/ucp_allow_pm_test.php b/tests/functional/ucp_allow_pm_test.php
index b433ec8e75..2d41296ddf 100644
--- a/tests/functional/ucp_allow_pm_test.php
+++ b/tests/functional/ucp_allow_pm_test.php

diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php
index f48c793ea1..2b075b37a5 100644
--- a/tests/functional/ucp_groups_test.php
+++ b/tests/functional/ucp_groups_test.php

diff --git a/tests/functional/ucp_pm_test.php b/tests/functional/ucp_pm_test.php
index 09521cc9f4..ddd5c8d791 100644
--- a/tests/functional/ucp_pm_test.php
+++ b/tests/functional/ucp_pm_test.php

diff --git a/tests/functional/ucp_profile_test.php b/tests/functional/ucp_profile_test.php
index e0e6255f79..ea08eece78 100644
--- a/tests/functional/ucp_profile_test.php
+++ b/tests/functional/ucp_profile_test.php

diff --git a/tests/functional/user_password_reset_test.php b/tests/functional/user_password_reset_test.php
index 65222c1aa6..f9406f0eb5 100644
--- a/tests/functional/user_password_reset_test.php
+++ b/tests/functional/user_password_reset_test.php

diff --git a/tests/functional/visibility_disapprove_test.php b/tests/functional/visibility_disapprove_test.php
index ca6f6f5f37..6f6edba422 100644
--- a/tests/functional/visibility_disapprove_test.php
+++ b/tests/functional/visibility_disapprove_test.php

diff --git a/tests/functional/visibility_reapprove_test.php b/tests/functional/visibility_reapprove_test.php
index 57a1212c57..5af2ddafa4 100644
--- a/tests/functional/visibility_reapprove_test.php
+++ b/tests/functional/visibility_reapprove_test.php

diff --git a/tests/functional/visibility_softdelete_test.php b/tests/functional/visibility_softdelete_test.php
index 3d44476ff0..bc722ea043 100644
--- a/tests/functional/visibility_softdelete_test.php
+++ b/tests/functional/visibility_softdelete_test.php