diff --git a/tests/notification/base.php b/tests/notification/base.php
index 59c7956ee8..d1861245bb 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -33,6 +33,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 			'notification.type.disapprove_post',
 			'notification.type.disapprove_topic',
 			'notification.type.forum',
+			'notification.type.mention',
 			'notification.type.pm',
 			'notification.type.post',
 			'notification.type.post_in_queue',
@@ -105,6 +106,14 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 		$phpbb_container->set('cache.driver', $cache_driver);
 		$phpbb_container->set('cache', $cache);
 		$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
+		$phpbb_container->set(
+			'text_formatter.s9e.mention_helper',
+			new \phpbb\textformatter\s9e\mention_helper(
+				$this->db,
+				$phpbb_root_path,
+				$phpEx
+			)
+		);
 		$phpbb_container->set('dispatcher', $this->phpbb_dispatcher);
 		$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
 		$phpbb_container->setParameter('core.php_ext', $phpEx);
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index 2d17b601a2..1e348f4529 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -132,6 +132,14 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
 		$phpbb_container->set('cache.driver', $cache_driver);
 		$phpbb_container->set('cache', $cache);
 		$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
+		$phpbb_container->set(
+			'text_formatter.s9e.mention_helper',
+			new \phpbb\textformatter\s9e\mention_helper(
+				$this->db,
+				$phpbb_root_path,
+				$phpEx
+			)
+		);
 		$phpbb_container->set('dispatcher', $phpbb_dispatcher);
 		$phpbb_container->set('storage.attachment', $storage);
 		$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
@@ -145,7 +153,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
 		$phpbb_container->compile();
 
 		// Notification Types
-		$notification_types = array('quote', 'bookmark', 'post', 'post_in_queue', 'topic', 'topic_in_queue', 'approve_topic', 'approve_post', 'forum');
+		$notification_types = array('quote', 'mention', 'bookmark', 'post', 'post_in_queue', 'topic', 'topic_in_queue', 'approve_topic', 'approve_post', 'forum');
 		$notification_types_array = array();
 		foreach ($notification_types as $type)
 		{