diff --git a/phpBB/phpbb/feed/controller/feed.php b/phpBB/phpbb/feed/controller/feed.php
index b498806e1b..3b469b240b 100644
--- a/phpBB/phpbb/feed/controller/feed.php
+++ b/phpBB/phpbb/feed/controller/feed.php
@@ -395,7 +395,7 @@ class feed
 			'FEED_TITLE'			=> $this->config['sitename'],
 			'FEED_SUBTITLE'			=> $this->config['site_desc'],
 			'FEED_UPDATED'			=> $this->feed_helper->format_date($feed_updated_time),
-			'FEED_LANG'				=> $this->lang_helper->get_lang_key_value('user_lang', $user->data['user_lang']),
+			'FEED_LANG'				=> $this->lang_helper->get_lang_key_value('user_lang', $this->user->data['user_lang']),
 			'FEED_AUTHOR'			=> $this->config['sitename'],
 
 			// Feed entries
diff --git a/tests/attachment/upload_test.php b/tests/attachment/upload_test.php
index 609ee99536..ddae3e84e0 100644
--- a/tests/attachment/upload_test.php
+++ b/tests/attachment/upload_test.php
@@ -11,6 +11,9 @@
 *
 */
 
+use phpbb\config\config;
+use phpbb\language\language_file_helper;
+
 require_once(__DIR__ . '/../../phpBB/includes/functions_posting.php');
 
 class phpbb_attachment_upload_test extends \phpbb_database_test_case
@@ -95,7 +98,7 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case
 		$this->request = $this->createMock('\phpbb\request\request');
 
 		$this->filesystem = new \phpbb\filesystem\filesystem();
-		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
+		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx), new language_file_helper($phpbb_root_path, $config), $config);
 		$this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper;
 		$guessers = array(
 			new \Symfony\Component\Mime\FileinfoMimeTypeGuesser(),
diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php
index e5bfdbf858..f3fab80b80 100644
--- a/tests/auth/provider_apache_test.php
+++ b/tests/auth/provider_apache_test.php
@@ -31,7 +31,8 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 		$db = $this->new_dbal();
 		$config = new \phpbb\config\config(array());
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
-		$lang = new \phpbb\language\language($lang_loader);
+		$lang_helper = new \phpbb\language\language_file_helper($phpbb_root_path, $config);
+		$lang = new \phpbb\language\language($lang_loader, $lang_helper, $config);
 		$this->request = $this->createMock('\phpbb\request\request');
 		$this->user = new \phpbb\user($lang, '\phpbb\datetime');;