diff --git a/composer.json b/composer.json
index aa9fd95..af85fb9 100644
--- a/composer.json
+++ b/composer.json
@@ -15,8 +15,9 @@
   },
   "require-dev": {
     "doctrine/coding-standard": "^4.0",
+    "phpstan/phpstan": "^0.10.3",
+    "phpstan/phpstan-phpunit": "^0.10.0",
     "phpunit/phpunit": "^7.2",
-    "phpstan/phpstan-shim": "^0.10",
     "psr/http-message": "^1.0",
     "react/promise": "2.*"
   },
@@ -42,6 +43,6 @@
   },
   "scripts": {
     "lint" : "phpcs",
-    "static-analysis": "@php ./vendor/bin/phpstan.phar analyse --ansi -l 1 -c phpstan.neon src"
+    "static-analysis": "@php ./vendor/bin/phpstan analyse --ansi -l 1 -c phpstan.neon src tests"
   }
 }
diff --git a/phpstan.neon b/phpstan.neon
index e69de29..b2b86dc 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -0,0 +1,3 @@
+includes:
+	- vendor/phpstan/phpstan-phpunit/extension.neon
+	- vendor/phpstan/phpstan-phpunit/rules.neon