diff --git a/src/Core/Logger/Factory/LegacyLoggerFactory.php b/src/Core/Logger/Factory/LegacyLoggerFactory.php
index 485f3b09dc..5c91d11771 100644
--- a/src/Core/Logger/Factory/LegacyLoggerFactory.php
+++ b/src/Core/Logger/Factory/LegacyLoggerFactory.php
@@ -15,7 +15,17 @@ use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
 /**
- * Manager for the core logging instances
+ * Bridge for the legacy Logger factory.
+ *
+ * This class can be removed after the following classes are replaced or
+ * refactored implementing the `\Friendica\Core\Logger\Factory\LoggerFactory`:
+ *
+ * - Friendica\Core\Logger\Factory\StreamLogger
+ * - Friendica\Core\Logger\Factory\SyslogLogger
+ * - monolog addon: Friendica\Addon\monolog\src\Factory\Monolog
+ *
+ * @see \Friendica\Core\Logger\Factory\StreamLogger
+ * @see \Friendica\Core\Logger\Factory\SyslogLogger
  */
 final class LegacyLoggerFactory implements LoggerFactory
 {
diff --git a/tests/Unit/Core/Logger/LoggerManagerTest.php b/tests/Unit/Core/Logger/LoggerManagerTest.php
index 14db1c2676..02f9c0b2e2 100644
--- a/tests/Unit/Core/Logger/LoggerManagerTest.php
+++ b/tests/Unit/Core/Logger/LoggerManagerTest.php
@@ -21,12 +21,25 @@ use Psr\Log\NullLogger;
 
 class LoggerManagerTest extends TestCase
 {
-	public function testGetLoggerReturnsPsrLogger(): void
+	/**
+	 * Clean the private static properties
+	 *
+	 * @see LoggerManager::$logger
+	 * @see LoggerManager::$logChannel
+	 */
+	protected function tearDown(): void
 	{
 		$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
 		$reflectionProperty->setAccessible(true);
 		$reflectionProperty->setValue(null, null);
 
+		$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logChannel');
+		$reflectionProperty->setAccessible(true);
+		$reflectionProperty->setValue(null, LogChannel::DEFAULT);
+	}
+
+	public function testGetLoggerReturnsPsrLogger(): void
+	{
 		$factory = new LoggerManager(
 			$this->createStub(IManageConfigValues::class),
 			$this->createStub(LoggerFactory::class)
@@ -37,10 +50,6 @@ class LoggerManagerTest extends TestCase
 
 	public function testGetLoggerReturnsSameObject(): void
 	{
-		$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
-		$reflectionProperty->setAccessible(true);
-		$reflectionProperty->setValue(null, null);
-
 		$factory = new LoggerManager(
 			$this->createStub(IManageConfigValues::class),
 			$this->createStub(LoggerFactory::class)
@@ -56,10 +65,6 @@ class LoggerManagerTest extends TestCase
 			['system', 'debugging', null, false],
 		]);
 
-		$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
-		$reflectionProperty->setAccessible(true);
-		$reflectionProperty->setValue(null, null);
-
 		$factory = new LoggerManager(
 			$config,
 			$this->createStub(LoggerFactory::class)
@@ -76,10 +81,6 @@ class LoggerManagerTest extends TestCase
 			['system', 'profiling', null, true],
 		]);
 
-		$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
-		$reflectionProperty->setAccessible(true);
-		$reflectionProperty->setValue(null, null);
-
 		$factory = new LoggerManager(
 			$config,
 			$this->createStub(LoggerFactory::class)
@@ -96,10 +97,6 @@ class LoggerManagerTest extends TestCase
 			['system', 'profiling', null, true],
 		]);
 
-		$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
-		$reflectionProperty->setAccessible(true);
-		$reflectionProperty->setValue(null, null);
-
 		$factory = new LoggerManager(
 			$config,
 			$this->createStub(LoggerFactory::class)
@@ -120,10 +117,6 @@ class LoggerManagerTest extends TestCase
 			['system', 'profiling', null, true],
 		]);
 
-		$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
-		$reflectionProperty->setAccessible(true);
-		$reflectionProperty->setValue(null, null);
-
 		$factory = new LoggerManager(
 			$config,
 			$this->createStub(LoggerFactory::class)