diff --git a/src/Addon/AddonManager.php b/src/Service/Addon/AddonManager.php
similarity index 95%
rename from src/Addon/AddonManager.php
rename to src/Service/Addon/AddonManager.php
index 55f7635975..8324db1d1d 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Service/Addon/AddonManager.php
@@ -7,8 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Friendica\Addon;
+namespace Friendica\Service\Addon;
 
+use Friendica\Addon\Addon;
+use Friendica\Addon\AddonBootstrap;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -34,7 +36,7 @@ final class AddonManager
 			try {
 				$this->bootstrapAddon($addonName);
 			} catch (\Throwable $th) {
-				// throw $th;
+				throw $th;
 			}
 		}
 	}
diff --git a/tests/Unit/Addon/AddonManagerTest.php b/tests/Unit/Service/Addon/AddonManagerTest.php
similarity index 75%
rename from tests/Unit/Addon/AddonManagerTest.php
rename to tests/Unit/Service/Addon/AddonManagerTest.php
index 266f249503..6c0f7c9707 100644
--- a/tests/Unit/Addon/AddonManagerTest.php
+++ b/tests/Unit/Service/Addon/AddonManagerTest.php
@@ -7,21 +7,21 @@
 
 declare(strict_types=1);
 
-namespace Friendica\Test\Unit\Addon;
+namespace Friendica\Test\Unit\Service\Addon;
 
-use Friendica\Addon\AddonManager;
+use Friendica\Service\Addon\AddonManager;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 
 class AddonManagerTest extends TestCase
 {
-	public function testLoadAddon(): void
+	public function testBootstrapAddonsLoadsTheAddon(): void
 	{
 		$logger = $this->createMock(LoggerInterface::class);
 		$logger->expects($this->once())->method('info')->with('Addon "helloaddon" loaded.');
 
 		$manager = new AddonManager(
-			dirname(__DIR__, 2) . '/Util',
+			dirname(__DIR__, 3) . '/Util',
 			$logger
 		);