diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d1d8adbdd5..78c7fdd93a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,7 +13,7 @@
 >
     <testsuites>
         <testsuite name="phpBB Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory suffix="_test.php">./tests/</directory>
         </testsuite>
     </testsuites>
     
diff --git a/tests/dbal/select.php b/tests/dbal/select_test.php
similarity index 100%
rename from tests/dbal/select.php
rename to tests/dbal/select_test.php
diff --git a/tests/dbal/write.php b/tests/dbal/write_test.php
similarity index 100%
rename from tests/dbal/write.php
rename to tests/dbal/write_test.php
diff --git a/tests/network/checkdnsrr.php b/tests/network/checkdnsrr_test.php
similarity index 100%
rename from tests/network/checkdnsrr.php
rename to tests/network/checkdnsrr_test.php
diff --git a/tests/random/gen_rand_string.php b/tests/random/gen_rand_string_test.php
similarity index 100%
rename from tests/random/gen_rand_string.php
rename to tests/random/gen_rand_string_test.php
diff --git a/tests/regex/censor.php b/tests/regex/censor_test.php
similarity index 100%
rename from tests/regex/censor.php
rename to tests/regex/censor_test.php
diff --git a/tests/regex/email.php b/tests/regex/email_test.php
similarity index 100%
rename from tests/regex/email.php
rename to tests/regex/email_test.php
diff --git a/tests/regex/ipv4.php b/tests/regex/ipv4_test.php
similarity index 100%
rename from tests/regex/ipv4.php
rename to tests/regex/ipv4_test.php
diff --git a/tests/regex/ipv6.php b/tests/regex/ipv6_test.php
similarity index 100%
rename from tests/regex/ipv6.php
rename to tests/regex/ipv6_test.php
diff --git a/tests/regex/url.php b/tests/regex/url_test.php
similarity index 100%
rename from tests/regex/url.php
rename to tests/regex/url_test.php
diff --git a/tests/request/request_var.php b/tests/request/request_var_test.php
similarity index 100%
rename from tests/request/request_var.php
rename to tests/request/request_var_test.php
diff --git a/tests/security/extract_current_page.php b/tests/security/extract_current_page_test.php
similarity index 100%
rename from tests/security/extract_current_page.php
rename to tests/security/extract_current_page_test.php
diff --git a/tests/security/redirect.php b/tests/security/redirect_test.php
similarity index 100%
rename from tests/security/redirect.php
rename to tests/security/redirect_test.php
diff --git a/tests/template/template.php b/tests/template/template_test.php
similarity index 100%
rename from tests/template/template.php
rename to tests/template/template_test.php
diff --git a/tests/text_processing/make_clickable.php b/tests/text_processing/make_clickable_test.php
similarity index 100%
rename from tests/text_processing/make_clickable.php
rename to tests/text_processing/make_clickable_test.php