diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 1913d38696..bb3856fc60 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -198,9 +198,6 @@ class container_builder
 
 				$this->container = $this->create_container($this->container_extensions);
 
-				// Mark all services public
-				$this->container->addCompilerPass(new pass\markpublic_pass());
-
 				// Easy collections through tags
 				$this->container->addCompilerPass(new pass\collection_pass());
 
@@ -220,6 +217,9 @@ class container_builder
 
 				$this->inject_custom_parameters();
 
+				// Mark all services public
+				$this->container->addCompilerPass(new pass\markpublic_pass());
+
 				if ($this->compile_container)
 				{
 					$this->container->compile();
diff --git a/phpBB/phpbb/di/pass/markpublic_pass.php b/phpBB/phpbb/di/pass/markpublic_pass.php
index 93b62d0816..7e5a8ae8ac 100644
--- a/phpBB/phpbb/di/pass/markpublic_pass.php
+++ b/phpBB/phpbb/di/pass/markpublic_pass.php
@@ -36,5 +36,13 @@ class markpublic_pass implements CompilerPassInterface
 				$definition->setPublic(true);
 			}
 		}
+
+		foreach ($container->getAliases() as $alias)
+		{
+			if ($alias->isPrivate())
+			{
+				$alias->setPublic(true);
+			}
+		}
 	}
 }
diff --git a/tests/notification/base.php b/tests/notification/base.php
index e9de0daac1..f6152f25ca 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -125,6 +125,9 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 		);
 
 		$phpbb_container->set('notification_manager', $this->notifications);
+
+		$phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
+
 		$phpbb_container->compile();
 
 		$this->notifications->setDependencies($this->auth, $this->config);
diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php
index d944846f76..ea9949d719 100644
--- a/tests/notification/notification_method_email_test.php
+++ b/tests/notification/notification_method_email_test.php
@@ -129,6 +129,9 @@ class notification_method_email_test extends phpbb_tests_notification_base
 		);
 
 		$phpbb_container->set('notification_manager', $this->notifications);
+
+		$phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
+
 		$phpbb_container->compile();
 
 		$this->notifications->setDependencies($this->auth, $this->config);
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index f144e486a3..d5307a8f7f 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -137,6 +137,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
 		$phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types');
 		$phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails');
 		$phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $config, $phpbb_dispatcher, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE));
+		$phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass());
 		$phpbb_container->compile();
 
 		// Notification Types