diff --git a/tests/regex/all_tests.php b/tests/regex/all_tests.php
index 0e193620e1..f2a23a0f98 100644
--- a/tests/regex/all_tests.php
+++ b/tests/regex/all_tests.php
@@ -30,9 +30,9 @@ class phpbb_regex_all_tests
 	{
 		$suite = new PHPUnit_Framework_TestSuite('phpBB Regular Expressions');
 
-		$suite->addTestSuite('phpbb_email_test');
-		$suite->addTestSuite('phpbb_ipv4_test');
-		$suite->addTestSuite('phpbb_ipv6_test');
+		$suite->addTestSuite('phpbb_regex_email_test');
+		$suite->addTestSuite('phpbb_regex_ipv4_test');
+		$suite->addTestSuite('phpbb_regex_ipv6_test');
 
 		return $suite;
 	}
diff --git a/tests/regex/email.php b/tests/regex/email.php
index 37fb9d81d0..b1519dfa5f 100644
--- a/tests/regex/email.php
+++ b/tests/regex/email.php
@@ -10,7 +10,7 @@
 require_once 'test_framework/framework.php';
 require_once '../phpBB/includes/functions.php';
 
-class phpbb_email_test extends phpbb_test_case
+class phpbb_regex_email_test extends phpbb_test_case
 {
 	protected $regex;
 
diff --git a/tests/regex/ipv4.php b/tests/regex/ipv4.php
index 5ffc700831..9d131ad0ca 100644
--- a/tests/regex/ipv4.php
+++ b/tests/regex/ipv4.php
@@ -10,7 +10,7 @@
 require_once 'test_framework/framework.php';
 require_once '../phpBB/includes/functions.php';
 
-class phpbb_ipv4_test extends phpbb_test_case
+class phpbb_regex_ipv4_test extends phpbb_test_case
 {
 	protected $regex;
 
diff --git a/tests/regex/ipv6.php b/tests/regex/ipv6.php
index 3f62f65f49..3d7a72e492 100644
--- a/tests/regex/ipv6.php
+++ b/tests/regex/ipv6.php
@@ -10,7 +10,7 @@
 require_once 'test_framework/framework.php';
 require_once '../phpBB/includes/functions.php';
 
-class phpbb_ipv6_test extends phpbb_test_case
+class phpbb_regex_ipv6_test extends phpbb_test_case
 {
 	protected $regex;