3 files changed, 11 insertions, 11 deletions
diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index 8d6c9a866d..3f13b9f216 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -43,8 +43,8 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		// Change the global cache object for this test because
 		// the mock cache object does not hit the database as is needed
 		// for this test.
-		$cache = new phpbb_cache_service(
-			new phpbb_cache_driver_file(),
+		$cache = new \phpbb\cache\service(
+			new \phpbb\cache\driver\file(),
 			$config,
 			$this->db,
 			$phpbb_root_path,
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index e9d16999ce..2600a46cc4 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -14,11 +14,11 @@ require_once dirname(__FILE__) . '/../../phpBB/phpbb/session.php';
  * This class exists to expose session.php's functions in a more testable way.
  *
  * Since many functions in session.php have global variables inside the function,
- * this exposes those functions through a testable facade that uses 
- * testable_factory's mock global variables to modify global variables used in 
+ * this exposes those functions through a testable facade that uses
+ * testable_factory's mock global variables to modify global variables used in
  * the functions.
  *
- * This is using the facade pattern to provide a testable "front" to the 
+ * This is using the facade pattern to provide a testable "front" to the
  * functions in sessions.php.
  *
  */
@@ -43,8 +43,8 @@ class phpbb_session_testable_facade
 		global $config, $request;
 		$config['server_name'] = $server_name_config;
 		$config['cookie_domain'] = $cookie_domain_config;
-		$request->overwrite('SERVER_NAME', $host, phpbb_request_interface::SERVER);
-		$request->overwrite('Host', $host, phpbb_request_interface::SERVER);
+		$request->overwrite('SERVER_NAME', $host, \phpbb\request\request_interface::SERVER);
+		$request->overwrite('Host', $host, \phpbb\request\request_interface::SERVER);
 		// Note: There is a php_uname function used as a fallthrough
 		//       that this function doesn't override
 		return $session->extract_current_hostname();
@@ -120,7 +120,7 @@ class phpbb_session_testable_facade
 		$session->host = $host;
 		$config['force_server_vars'] = $force_server_vars;
 		$config['server_name'] = $server_name;
-		$request->overwrite('SERVER_PORT', $server_port, phpbb_request_interface::SERVER);
+		$request->overwrite('SERVER_PORT', $server_port, \phpbb\request\request_interface::SERVER);
 		return $session->validate_referer($check_script_path);
 	}
 }
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index 8733ce15ef..a58e208efc 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -63,10 +63,10 @@ class phpbb_session_testable_factory
 	/**
 	* Retrieve the configured session class instance
 	*
-	* @param phpbb_db_driver $dbal The database connection to use for session data
+	* @param \phpbb\db\driver\driver $dbal The database connection to use for session data
 	* @return phpbb_mock_session_testable A session instance
 	*/
-	public function get_session(phpbb_db_driver $dbal)
+	public function get_session(\phpbb\db\driver\driver $dbal)
 	{
 		// set up all the global variables used by session
 		global $SID, $_SID, $db, $config, $cache, $request, $phpbb_container;
@@ -79,7 +79,7 @@ class phpbb_session_testable_factory
 		);
 		request_var(null, null, null, null, $request);
 
-		$config = $this->config = new phpbb_config($this->get_config_data());
+		$config = $this->config = new \phpbb\config\config($this->get_config_data());
 		set_config(null, null, null, $config);
 
 		$db = $dbal;