3 files changed, 6 insertions, 4 deletions
diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index 561b7faf49..04da5f08b9 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -42,7 +42,10 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		parent::setUp();
 		// Get session here so that config is mocked correctly
 		$this->session = $this->session_factory->get_session($this->db);
-		global $cache, $config, $phpbb_root_path, $phpEx;
+		global $cache, $config, $phpbb_root_path, $phpEx, $phpbb_filesystem;
+
+		$phpbb_filesystem = new \phpbb\filesystem\filesystem();
+
 		$this->backup_cache = $cache;
 		// Change the global cache object for this test because
 		// the mock cache object does not hit the database as is needed
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index f0d1cdb60e..96445ef9b3 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -145,7 +145,7 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 	{
 		global $symfony_request, $request, $phpbb_filesystem;
 
-		$phpbb_filesystem = new \phpbb\filesystem();
+		$phpbb_filesystem = new \phpbb\filesystem\filesystem();
 
 		$server['HTTP_HOST']			= 'localhost';
 		$server['SERVER_NAME']			= 'localhost';
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index 3e25286480..7819063505 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -81,10 +81,8 @@ class phpbb_session_testable_factory
 			$this->cookies,
 			$this->server_data
 		);
-		request_var(null, null, null, null, $request);
 
 		$config = $this->config = new \phpbb\config\config($this->get_config_data());
-		set_config(null, null, null, $config);
 
 		$db = $dbal;
 
@@ -96,6 +94,7 @@ class phpbb_session_testable_factory
 			'auth.provider.db',
 			new phpbb_mock_auth_provider()
 		);
+		$phpbb_container->setParameter('core.environment', PHPBB_ENVIRONMENT);
 		$provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config);
 		$provider_collection->add('auth.provider.db');
 		$phpbb_container->set(