diff --git a/composer.json b/composer.json
index 284ac5d68..a7b45b1f2 100644
--- a/composer.json
+++ b/composer.json
@@ -29,9 +29,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0",
-        "symfony/psr-http-message-bridge": "^1.0",
+        "nyholm/psr7": "^1.1",
+        "symfony/psr-http-message-bridge": "^2.0",
         "guzzlehttp/guzzle": "^6.3",
-        "zendframework/zend-diactoros": "^2.1",
         "jdorn/sql-formatter": "^1.2"
     },
     "autoload": {
diff --git a/test/Middleware.php b/test/Middleware.php
index b313906d8..7ad3bde6d 100644
--- a/test/Middleware.php
+++ b/test/Middleware.php
@@ -15,8 +15,10 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
-use Symfony\Bridge\PsrHttpMessage\Factory;
-use Zend\Diactoros\Uri;
+use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
+use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Nyholm\Psr7\Uri;
 
 use Volkszaehler\Router;
 
@@ -63,8 +65,10 @@ static function setupBeforeClass() {
 
 		if (testAdapter == 'HTTP') {
 			static::$client = new Client();
-			static::$httpFoundationFactory = new Factory\HttpFoundationFactory();
-			static::$psrFoundationFactory = new Factory\DiactorosFactory();
+			static::$httpFoundationFactory = new HttpFoundationFactory();
+
+			$psr17Factory = new Psr17Factory();
+			static::$psrFoundationFactory = new PsrHttpFactory($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
 		}
 		// cache entity manager
 		else if (null == self::$app) {