diff --git a/tests/acp_board/auth_provider/invalid.php b/tests/acp_board/auth_provider/invalid.php
index c12851afe6..acce3b7e2d 100644
--- a/tests/acp_board/auth_provider/invalid.php
+++ b/tests/acp_board/auth_provider/invalid.php
@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_auth_provider_acp_board_invalid
+namespace phpbb\auth\provider\acp;
+
+class board_invalid
 {
 
 }
diff --git a/tests/acp_board/select_auth_method_test.php b/tests/acp_board/select_auth_method_test.php
index 91aa5d1232..b943554564 100644
--- a/tests/acp_board/select_auth_method_test.php
+++ b/tests/acp_board/select_auth_method_test.php
@@ -31,8 +31,8 @@ class phpbb_acp_board_select_auth_method_test extends phpbb_test_case
 		$phpbb_container = new phpbb_mock_container_builder();
 
 		$phpbb_container->set('auth.provider_collection', array(
-				'auth.provider.acp_board_valid'		=> new phpbb_auth_provider_acp_board_valid,
-				'auth.provider.acp_board_invalid'	=> new phpbb_auth_provider_acp_board_invalid,
+				'auth.provider.acp_board_valid'		=> new phpbb\auth\provider\acp\board_valid,
+				'auth.provider.acp_board_invalid'	=> new phpbb\auth\provider\acp\board_invalid,
 		));
 
 		$this->acp_board = new acp_board();
diff --git a/tests/controller/config/services.yml b/tests/controller/config/services.yml
index f1bd047489..e4412af3d7 100644
--- a/tests/controller/config/services.yml
+++ b/tests/controller/config/services.yml
@@ -1,3 +1,3 @@
 services:
     core_foo.controller:
-        class: phpbb_controller_foo
+        class: phpbb\controller\foo
diff --git a/tests/controller/phpbb/controller/foo.php b/tests/controller/phpbb/controller/foo.php
index 04576e16c4..98669f428f 100644
--- a/tests/controller/phpbb/controller/foo.php
+++ b/tests/controller/phpbb/controller/foo.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace phpbb\controller;
+
 use Symfony\Component\HttpFoundation\Response;
 
-class phpbb_controller_foo
+class foo
 {
 	/**
 	* Bar method