diff --git a/tests/mention/controller_test.php b/tests/mention/controller_test.php
index f3ed3babd1..74c6a08f0c 100644
--- a/tests/mention/controller_test.php
+++ b/tests/mention/controller_test.php
@@ -111,7 +111,24 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 		$phpbb_container->set('cache.driver', $cache_driver);
 		$phpbb_container->set('cache', $cache);
 		$phpbb_container->set('request', $request);
-		$phpbb_container->set('group_helper', new \phpbb\group\helper($lang));
+		$phpbb_container->set('group_helper', new \phpbb\group\helper(
+			$this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(),
+			$cache,
+			$config,
+			new \phpbb\language\language(
+				new phpbb\language\language_file_loader($phpbb_root_path, $phpEx)
+			),
+			new phpbb_mock_event_dispatcher(),
+			new \phpbb\path_helper(
+				new \phpbb\symfony_request(
+					new phpbb_mock_request()
+				),
+				$this->getMockBuilder('\phpbb\request\request')->disableOriginalConstructor()->getMock(),
+				$phpbb_root_path,
+				$phpEx
+			),
+			$user
+		));
 		$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
 		$phpbb_container->set(
 			'text_formatter.s9e.mention_helper',
diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php
index 87db91aa1c..2c71b0eda9 100644
--- a/tests/notification/notification_method_email_test.php
+++ b/tests/notification/notification_method_email_test.php
@@ -91,6 +91,16 @@ class notification_method_email_test extends phpbb_tests_notification_base
 		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
 		$phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types');
 		$phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails');
+		$phpbb_container->set(
+			'text_formatter.s9e.mention_helper',
+			new \phpbb\textformatter\s9e\mention_helper(
+				$this->db,
+				$auth,
+				$this->user,
+				$phpbb_root_path,
+				$phpEx
+			)
+		);
 
 		$this->notification_method_email = $this->getMockBuilder('\phpbb\notification\method\email')
 			->setConstructorArgs([