3 files changed, 9 insertions, 5 deletions
diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
index a32c339afa..f69ba9f122 100644
--- a/tests/functional/fileupload_remote_test.php
+++ b/tests/functional/fileupload_remote_test.php
@@ -53,7 +53,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 		$this->request = $this->getMock('\phpbb\request\request');
 
 		$container = new phpbb_mock_container_builder();
-		$container->set('files.filespec', new \phpbb\files\filespec($this->filesystem, $this->language));
+		$container->set('files.filespec', new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path));
 		$this->factory = new \phpbb\files\factory($container);
 		$container->set('files.factory', $this->factory);
 		$this->phpbb_root_path = $phpbb_root_path;
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index b28adc3f28..b0df72a6ff 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -28,6 +28,9 @@ class phpbb_filespec_test extends phpbb_test_case
 	/** @var \phpbb\language\language */
 	protected $language;
 
+	/** @var string phpBB root path */
+	protected $phpbb_root_path;
+
 	protected function setUp()
 	{
 		// Global $config required by unique_id
@@ -76,6 +79,7 @@ class phpbb_filespec_test extends phpbb_test_case
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
 		$this->filesystem = new \phpbb\filesystem\filesystem();
+		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
 	private function get_filespec($override = array())
@@ -89,7 +93,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
 		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
@@ -297,8 +301,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	{
 		// Global $phpbb_root_path and $phpEx are required by phpbb_chmod
 		global $phpbb_root_path, $phpEx;
-		$phpbb_root_path = '';
-		$phpEx = 'php';
+		$this->phpbb_root_path = '';
 
 		$upload = new phpbb_mock_fileupload();
 		$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
@@ -319,7 +322,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			$this->assertEquals($error, $filespec->error[0]);
 		}
 
-		$phpEx = '';
+		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
 	/**
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 0832f269cb..c62e9a1947 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -58,6 +58,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$this->container->set('files.filespec', new \phpbb\files\filespec(
 			$this->filesystem,
 			$this->language,
+			$phpbb_root_path,
 			new \phpbb\mimetype\guesser(array(
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
 			))));