diff --git a/tests/text_reparser/contact_admin_info_test.php b/tests/text_reparser/plugins/contact_admin_info_test.php
similarity index 89%
rename from tests/text_reparser/contact_admin_info_test.php
rename to tests/text_reparser/plugins/contact_admin_info_test.php
index 5cccdfa4d5..e577d2fd3d 100644
--- a/tests/text_reparser/contact_admin_info_test.php
+++ b/tests/text_reparser/plugins/contact_admin_info_test.php
@@ -10,9 +10,9 @@
 * the docs/CREDITS.txt file.
 *
 */
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
-require_once __DIR__ . '/../test_framework/phpbb_database_test_case.php';
+require_once __DIR__ . '/../../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../../phpBB/includes/functions_content.php';
+require_once __DIR__ . '/../../test_framework/phpbb_database_test_case.php';
 
 class phpbb_textreparser_contact_admin_info_test extends phpbb_database_test_case
 {
diff --git a/tests/text_reparser/fixtures/contact_admin_info.xml b/tests/text_reparser/plugins/fixtures/contact_admin_info.xml
similarity index 100%
rename from tests/text_reparser/fixtures/contact_admin_info.xml
rename to tests/text_reparser/plugins/fixtures/contact_admin_info.xml
diff --git a/tests/text_reparser/fixtures/forums.xml b/tests/text_reparser/plugins/fixtures/forums.xml
similarity index 100%
rename from tests/text_reparser/fixtures/forums.xml
rename to tests/text_reparser/plugins/fixtures/forums.xml
diff --git a/tests/text_reparser/fixtures/groups.xml b/tests/text_reparser/plugins/fixtures/groups.xml
similarity index 100%
rename from tests/text_reparser/fixtures/groups.xml
rename to tests/text_reparser/plugins/fixtures/groups.xml
diff --git a/tests/text_reparser/fixtures/poll_options.xml b/tests/text_reparser/plugins/fixtures/poll_options.xml
similarity index 100%
rename from tests/text_reparser/fixtures/poll_options.xml
rename to tests/text_reparser/plugins/fixtures/poll_options.xml
diff --git a/tests/text_reparser/fixtures/polls.xml b/tests/text_reparser/plugins/fixtures/polls.xml
similarity index 100%
rename from tests/text_reparser/fixtures/polls.xml
rename to tests/text_reparser/plugins/fixtures/polls.xml
diff --git a/tests/text_reparser/fixtures/posts.xml b/tests/text_reparser/plugins/fixtures/posts.xml
similarity index 100%
rename from tests/text_reparser/fixtures/posts.xml
rename to tests/text_reparser/plugins/fixtures/posts.xml
diff --git a/tests/text_reparser/fixtures/privmsgs.xml b/tests/text_reparser/plugins/fixtures/privmsgs.xml
similarity index 100%
rename from tests/text_reparser/fixtures/privmsgs.xml
rename to tests/text_reparser/plugins/fixtures/privmsgs.xml
diff --git a/tests/text_reparser/fixtures/users.xml b/tests/text_reparser/plugins/fixtures/users.xml
similarity index 100%
rename from tests/text_reparser/fixtures/users.xml
rename to tests/text_reparser/plugins/fixtures/users.xml
diff --git a/tests/text_reparser/forum_description_test.php b/tests/text_reparser/plugins/forum_description_test.php
similarity index 100%
rename from tests/text_reparser/forum_description_test.php
rename to tests/text_reparser/plugins/forum_description_test.php
diff --git a/tests/text_reparser/forum_rules_test.php b/tests/text_reparser/plugins/forum_rules_test.php
similarity index 100%
rename from tests/text_reparser/forum_rules_test.php
rename to tests/text_reparser/plugins/forum_rules_test.php
diff --git a/tests/text_reparser/group_description_test.php b/tests/text_reparser/plugins/group_description_test.php
similarity index 100%
rename from tests/text_reparser/group_description_test.php
rename to tests/text_reparser/plugins/group_description_test.php
diff --git a/tests/text_reparser/pm_text_test.php b/tests/text_reparser/plugins/pm_text_test.php
similarity index 100%
rename from tests/text_reparser/pm_text_test.php
rename to tests/text_reparser/plugins/pm_text_test.php
diff --git a/tests/text_reparser/poll_option_test.php b/tests/text_reparser/plugins/poll_option_test.php
similarity index 91%
rename from tests/text_reparser/poll_option_test.php
rename to tests/text_reparser/plugins/poll_option_test.php
index 669d859f9a..e043858597 100644
--- a/tests/text_reparser/poll_option_test.php
+++ b/tests/text_reparser/plugins/poll_option_test.php
@@ -10,9 +10,9 @@
 * the docs/CREDITS.txt file.
 *
 */
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
-require_once __DIR__ . '/../test_framework/phpbb_database_test_case.php';
+require_once __DIR__ . '/../../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../../phpBB/includes/functions_content.php';
+require_once __DIR__ . '/../../test_framework/phpbb_database_test_case.php';
 
 class phpbb_textreparser_poll_option_test extends phpbb_database_test_case
 {
diff --git a/tests/text_reparser/poll_title_test.php b/tests/text_reparser/plugins/poll_title_test.php
similarity index 100%
rename from tests/text_reparser/poll_title_test.php
rename to tests/text_reparser/plugins/poll_title_test.php
diff --git a/tests/text_reparser/post_text_test.php b/tests/text_reparser/plugins/post_text_test.php
similarity index 100%
rename from tests/text_reparser/post_text_test.php
rename to tests/text_reparser/plugins/post_text_test.php
diff --git a/tests/text_reparser/test_row_based_plugin.php b/tests/text_reparser/plugins/test_row_based_plugin.php
similarity index 93%
rename from tests/text_reparser/test_row_based_plugin.php
rename to tests/text_reparser/plugins/test_row_based_plugin.php
index 489dff280b..befcb48bda 100644
--- a/tests/text_reparser/test_row_based_plugin.php
+++ b/tests/text_reparser/plugins/test_row_based_plugin.php
@@ -10,9 +10,9 @@
 * the docs/CREDITS.txt file.
 *
 */
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
-require_once __DIR__ . '/../test_framework/phpbb_database_test_case.php';
+require_once __DIR__ . '/../../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../../phpBB/includes/functions_content.php';
+require_once __DIR__ . '/../../test_framework/phpbb_database_test_case.php';
 
 abstract class phpbb_textreparser_test_row_based_plugin extends phpbb_database_test_case
 {
diff --git a/tests/text_reparser/user_signature_test.php b/tests/text_reparser/plugins/user_signature_test.php
similarity index 100%
rename from tests/text_reparser/user_signature_test.php
rename to tests/text_reparser/plugins/user_signature_test.php