diff --git a/tests/cases/Decorator/DecoratorManager.phpt b/tests/cases/Decorator/DecoratorManager.phpt
new file mode 100644
index 00000000..f69c4657
--- /dev/null
+++ b/tests/cases/Decorator/DecoratorManager.phpt
@@ -0,0 +1,104 @@
+<?php declare(strict_types = 1);
+
+/**
+ * Test: Decorator\DecoratorManager
+ */
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+use Apitte\Core\Decorator\DecoratorManager;
+use Apitte\Core\Decorator\IDecorator;
+use Contributte\Psr7\Psr7ResponseFactory;
+use Contributte\Psr7\Psr7ServerRequestFactory;
+use Tester\Assert;
+use Tests\Fixtures\Decorator\ReturnNullDecorator;
+use Tests\Fixtures\Decorator\ReturnRequestDecorator;
+use Tests\Fixtures\Decorator\ReturnResponseDecorator;
+
+// Decorate request
+test(function (): void {
+	$manager = new DecoratorManager();
+	$request = Psr7ServerRequestFactory::fromSuperGlobal();
+	$response = Psr7ResponseFactory::fromGlobal();
+
+	$manager->addDecorator(IDecorator::ON_HANDLER_BEFORE, new ReturnRequestDecorator());
+	$manager->addDecorator(IDecorator::ON_HANDLER_BEFORE, new ReturnRequestDecorator());
+	$manager->addDecorator(IDecorator::ON_HANDLER_BEFORE, new ReturnRequestDecorator());
+
+	Assert::same($request, $manager->decorateRequest(IDecorator::ON_HANDLER_BEFORE, $request, $response));
+});
+
+// Decorate request - return null
+test(function (): void {
+	$manager = new DecoratorManager();
+	$request = Psr7ServerRequestFactory::fromSuperGlobal();
+	$response = Psr7ResponseFactory::fromGlobal();
+
+	$manager->addDecorator(IDecorator::ON_HANDLER_BEFORE, new ReturnRequestDecorator());
+	$manager->addDecorator(IDecorator::ON_HANDLER_BEFORE, new ReturnNullDecorator());
+	$manager->addDecorator(IDecorator::ON_HANDLER_BEFORE, new ReturnRequestDecorator());
+
+	Assert::same(null, $manager->decorateRequest(IDecorator::ON_HANDLER_BEFORE, $request, $response));
+});
+
+// Decorate request - no decorators
+test(function (): void {
+	$manager = new DecoratorManager();
+	$request = Psr7ServerRequestFactory::fromSuperGlobal();
+	$response = Psr7ResponseFactory::fromGlobal();
+
+	Assert::same($request, $manager->decorateRequest(IDecorator::ON_HANDLER_BEFORE, $request, $response));
+});
+
+// Decorate response
+test(function (): void {
+	$manager = new DecoratorManager();
+	$request = Psr7ServerRequestFactory::fromSuperGlobal();
+	$response = Psr7ResponseFactory::fromGlobal();
+
+	$manager->addDecorator(IDecorator::ON_HANDLER_AFTER, new ReturnResponseDecorator());
+	$manager->addDecorator(IDecorator::ON_HANDLER_AFTER, new ReturnResponseDecorator());
+	$manager->addDecorator(IDecorator::ON_HANDLER_AFTER, new ReturnResponseDecorator());
+
+	Assert::same($response, $manager->decorateResponse(IDecorator::ON_HANDLER_AFTER, $request, $response));
+});
+
+// Decorate response - return null
+test(function (): void {
+	$manager = new DecoratorManager();
+	$request = Psr7ServerRequestFactory::fromSuperGlobal();
+	$response = Psr7ResponseFactory::fromGlobal();
+
+	$manager->addDecorator(IDecorator::ON_HANDLER_AFTER, new ReturnResponseDecorator());
+	$manager->addDecorator(IDecorator::ON_HANDLER_AFTER, new ReturnNullDecorator());
+	$manager->addDecorator(IDecorator::ON_HANDLER_AFTER, new ReturnResponseDecorator());
+
+	Assert::same(null, $manager->decorateResponse(IDecorator::ON_HANDLER_AFTER, $request, $response));
+});
+
+// Decorate response - no decorators
+test(function (): void {
+	$manager = new DecoratorManager();
+	$request = Psr7ServerRequestFactory::fromSuperGlobal();
+	$response = Psr7ResponseFactory::fromGlobal();
+
+	Assert::same($response, $manager->decorateResponse(IDecorator::ON_HANDLER_AFTER, $request, $response));
+});
+
+// Decorate response - no decorators
+test(function (): void {
+	$manager = new DecoratorManager();
+	$request = Psr7ServerRequestFactory::fromSuperGlobal();
+	$response = Psr7ResponseFactory::fromGlobal();
+
+	Assert::same($response, $manager->decorateResponse(IDecorator::ON_HANDLER_AFTER, $request, $response));
+});
+
+// Decorate response exception - no decorators
+test(function (): void {
+	$manager = new DecoratorManager();
+	$request = Psr7ServerRequestFactory::fromSuperGlobal();
+	$response = Psr7ResponseFactory::fromGlobal();
+
+	Assert::same(null, $manager->decorateResponse(IDecorator::ON_DISPATCHER_EXCEPTION, $request, $response));
+});
diff --git a/tests/fixtures/Decorator/ReturnNullDecorator.php b/tests/fixtures/Decorator/ReturnNullDecorator.php
new file mode 100644
index 00000000..3f39c916
--- /dev/null
+++ b/tests/fixtures/Decorator/ReturnNullDecorator.php
@@ -0,0 +1,21 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Fixtures\Decorator;
+
+use Apitte\Core\Decorator\IDecorator;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class ReturnNullDecorator implements IDecorator
+{
+
+	/**
+	 * @param mixed[] $context
+	 * @return null
+	 */
+	public function decorate(ServerRequestInterface $request, ResponseInterface $response, array $context = [])
+	{
+		return null;
+	}
+
+}
diff --git a/tests/fixtures/Decorator/ReturnRequestDecorator.php b/tests/fixtures/Decorator/ReturnRequestDecorator.php
new file mode 100644
index 00000000..8726c342
--- /dev/null
+++ b/tests/fixtures/Decorator/ReturnRequestDecorator.php
@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Fixtures\Decorator;
+
+use Apitte\Core\Decorator\IDecorator;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class ReturnRequestDecorator implements IDecorator
+{
+
+	/**
+	 * @param mixed[] $context
+	 */
+	public function decorate(ServerRequestInterface $request, ResponseInterface $response, array $context = []): ServerRequestInterface
+	{
+		return $request;
+	}
+
+}
diff --git a/tests/fixtures/Decorator/ReturnResponseDecorator.php b/tests/fixtures/Decorator/ReturnResponseDecorator.php
new file mode 100644
index 00000000..7af861ba
--- /dev/null
+++ b/tests/fixtures/Decorator/ReturnResponseDecorator.php
@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Fixtures\Decorator;
+
+use Apitte\Core\Decorator\IDecorator;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class ReturnResponseDecorator implements IDecorator
+{
+
+	/**
+	 * @param mixed[] $context
+	 */
+	public function decorate(ServerRequestInterface $request, ResponseInterface $response, array $context = []): ResponseInterface
+	{
+		return $response;
+	}
+
+}