diff --git a/tests/controller/common_helper_route_test.php b/tests/controller/common_helper_route.php
similarity index 99%
rename from tests/controller/common_helper_route_test.php
rename to tests/controller/common_helper_route.php
index 7fc046879b..1751578a75 100644
--- a/tests/controller/common_helper_route_test.php
+++ b/tests/controller/common_helper_route.php
@@ -15,7 +15,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
-abstract class phpbb_controller_common_helper_route_test extends phpbb_test_case
+abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 {
 	protected $root_path;
 
diff --git a/tests/controller/helper_route_adm_subdir_test.php b/tests/controller/helper_route_adm_subdir_test.php
index 02ff687be0..f27ac81b04 100644
--- a/tests/controller/helper_route_adm_subdir_test.php
+++ b/tests/controller/helper_route_adm_subdir_test.php
@@ -12,9 +12,9 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/common_helper_route_test.php';
+require_once dirname(__FILE__) . '/common_helper_route.php';
 
-class phpbb_controller_helper_route_adm_subdir_test extends phpbb_controller_common_helper_route_test
+class phpbb_controller_helper_route_adm_subdir_test extends phpbb_controller_common_helper_route
 {
 	protected function get_phpbb_root_path()
 	{
diff --git a/tests/controller/helper_route_adm_test.php b/tests/controller/helper_route_adm_test.php
index 76cf4a2872..86dc36ef1f 100644
--- a/tests/controller/helper_route_adm_test.php
+++ b/tests/controller/helper_route_adm_test.php
@@ -12,9 +12,9 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/common_helper_route_test.php';
+require_once dirname(__FILE__) . '/common_helper_route.php';
 
-class phpbb_controller_helper_route_adm_test extends phpbb_controller_common_helper_route_test
+class phpbb_controller_helper_route_adm_test extends phpbb_controller_common_helper_route
 {
 	protected function get_phpbb_root_path()
 	{
diff --git a/tests/controller/helper_route_root_test.php b/tests/controller/helper_route_root_test.php
index f3978d3e37..63a2f2f8f7 100644
--- a/tests/controller/helper_route_root_test.php
+++ b/tests/controller/helper_route_root_test.php
@@ -12,9 +12,9 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/common_helper_route_test.php';
+require_once dirname(__FILE__) . '/common_helper_route.php';
 
-class phpbb_controller_helper_route_test extends phpbb_controller_common_helper_route_test
+class phpbb_controller_helper_route_test extends phpbb_controller_common_helper_route
 {
 	protected function get_phpbb_root_path()
 	{
diff --git a/tests/controller/helper_route_unclean_path_test.php b/tests/controller/helper_route_unclean_path_test.php
index 9a4c80937c..9d8b62bc1c 100644
--- a/tests/controller/helper_route_unclean_path_test.php
+++ b/tests/controller/helper_route_unclean_path_test.php
@@ -12,9 +12,9 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/common_helper_route_test.php';
+require_once dirname(__FILE__) . '/common_helper_route.php';
 
-class phpbb_controller_helper_route_unclean_path_test extends phpbb_controller_common_helper_route_test
+class phpbb_controller_helper_route_unclean_path_test extends phpbb_controller_common_helper_route
 {
 	protected function get_phpbb_root_path()
 	{