diff --git a/src/CommandMiddleware.php b/src/CommandMiddleware.php
index 21b6ca3..57c8789 100644
--- a/src/CommandMiddleware.php
+++ b/src/CommandMiddleware.php
@@ -13,14 +13,14 @@
 namespace Prooph\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use Prooph\Common\Messaging\MessageFactory;
 use Prooph\HttpMiddleware\Exception\RuntimeException;
 use Prooph\HttpMiddleware\Response\ResponseStrategy;
 use Prooph\ServiceBus\CommandBus;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Command messages describe actions your model can handle.
diff --git a/src/EventMiddleware.php b/src/EventMiddleware.php
index 931fc85..462534b 100644
--- a/src/EventMiddleware.php
+++ b/src/EventMiddleware.php
@@ -13,14 +13,14 @@
 namespace Prooph\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use Prooph\Common\Messaging\MessageFactory;
 use Prooph\HttpMiddleware\Exception\RuntimeException;
 use Prooph\HttpMiddleware\Response\ResponseStrategy;
 use Prooph\ServiceBus\EventBus;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Event messages describe things that happened while your model handled a command.
diff --git a/src/MessageMiddleware.php b/src/MessageMiddleware.php
index 05dc985..ed3c0e7 100644
--- a/src/MessageMiddleware.php
+++ b/src/MessageMiddleware.php
@@ -13,8 +13,6 @@
 namespace Prooph\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageDataAssertion;
 use Prooph\Common\Messaging\MessageFactory;
@@ -25,6 +23,8 @@
 use Prooph\ServiceBus\QueryBus;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Ramsey\Uuid\Uuid;
 
 /**
diff --git a/src/QueryMiddleware.php b/src/QueryMiddleware.php
index b470b60..c577bfd 100644
--- a/src/QueryMiddleware.php
+++ b/src/QueryMiddleware.php
@@ -14,14 +14,14 @@
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use Prooph\Common\Messaging\MessageFactory;
 use Prooph\HttpMiddleware\Exception\RuntimeException;
 use Prooph\HttpMiddleware\Response\ResponseStrategy;
 use Prooph\ServiceBus\QueryBus;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Query messages describe available information that can be fetched from your (read) model.
diff --git a/tests/CommandMiddlewareTest.php b/tests/CommandMiddlewareTest.php
index 85b04c8..e69c239 100644
--- a/tests/CommandMiddlewareTest.php
+++ b/tests/CommandMiddlewareTest.php
@@ -13,7 +13,6 @@
 namespace ProophTest\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageFactory;
@@ -25,6 +24,7 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Test integrity of \Prooph\HttpMiddleware\CommandMiddleware
diff --git a/tests/EventMiddlewareTest.php b/tests/EventMiddlewareTest.php
index fb5327a..cbf8cf4 100644
--- a/tests/EventMiddlewareTest.php
+++ b/tests/EventMiddlewareTest.php
@@ -13,7 +13,6 @@
 namespace ProophTest\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageFactory;
@@ -25,6 +24,7 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 
 /**
  * Test integrity of \Prooph\HttpMiddleware\EventMiddleware
diff --git a/tests/MessageMiddlewareTest.php b/tests/MessageMiddlewareTest.php
index 81e0210..adfb213 100644
--- a/tests/MessageMiddlewareTest.php
+++ b/tests/MessageMiddlewareTest.php
@@ -13,7 +13,6 @@
 namespace ProophTest\HttpMiddleware;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageFactory;
@@ -26,6 +25,7 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use React\Promise\Promise;
 
 /**
diff --git a/tests/QueryMiddlewareTest.php b/tests/QueryMiddlewareTest.php
index 409c6d8..c5c9ba9 100644
--- a/tests/QueryMiddlewareTest.php
+++ b/tests/QueryMiddlewareTest.php
@@ -12,7 +12,6 @@
 
 namespace ProophTest\HttpMiddleware;
 
-use Psr\Http\Server\RequestHandlerInterface;
 use PHPUnit\Framework\TestCase;
 use Prooph\Common\Messaging\Message;
 use Prooph\Common\Messaging\MessageFactory;
@@ -24,6 +23,7 @@
 use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use React\Promise\Promise;
 
 /**