diff --git a/Tests/StaticAnalysis/Stubs/CommandController.php b/Tests/StaticAnalysis/Stubs/CommandController.php
new file mode 100644
index 00000000..13965b4b
--- /dev/null
+++ b/Tests/StaticAnalysis/Stubs/CommandController.php
@@ -0,0 +1,6 @@
+<?php
+namespace TYPO3\CMS\Extbase\Mvc\Controller;
+
+class CommandController
+{
+}
diff --git a/composer.json b/composer.json
index 8f7940a4..ec7f2002 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
         "php-parallel-lint/php-parallel-lint": "^1.2",
         "phpstan/phpstan": "^0.12.42",
         "phpunit/phpunit": "^7.0",
+        "psr/http-server-middleware": "^1.0",
         "saschaegerer/phpstan-typo3": "^0.13.1",
         "sclable/xml-lint": "^0.3.0",
         "slevomat/coding-standard": "^6.4",
@@ -52,7 +53,10 @@
         "psr-4": {
             "PAGEmachine\\Searchable\\Tests\\": "Tests/",
             "TYPO3\\CMS\\Core\\Tests\\": "vendor/typo3/cms/typo3/sysext/core/Tests/"
-        }
+        },
+        "classmap": [
+            "Tests/StaticAnalysis/Stubs/CommandController.php"
+        ]
     },
     "scripts": {
         "analyze:php": "phpstan analyse --ansi --no-progress --configuration=phpstan.neon",
diff --git a/phpstan.neon b/phpstan.neon
index 3105c913..93405d1c 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -7,6 +7,9 @@ parameters:
     - ext_tables.php
     - Classes
 
+  excludes_analyse:
+    - Classes/Command/SearchableCommandController.php
+
   ignoreErrors:
     - message: '#Variable \$_EXTKEY might not be defined.#'
       path: ext_emconf.php
@@ -14,13 +17,13 @@ parameters:
       path: Classes/Middleware/UriBuilder.php
     - message: '#TYPO3\\CMS\\Core\\Context\\.+#'
       path: Classes/ViewHelpers/SiteLanguageViewHelper.php
-    - message: '#TYPO3\\CMS\\Extbase\\Mvc\\Controller\\CommandController#'
-      paths:
-        - ext_localconf.php
-        - Classes/Command/SearchableCommandController.php
     - message: '#TYPO3\\CMS\\Core\\Database\\PostProcessQueryHookInterface#'
       paths:
         - ext_localconf.php
         - Classes/Hook/DatabaseConnectionHook.php
+    - message: '#TYPO3\\CMS\\Core\\Context\\Context#'
+      path: Classes/Middleware/UriBuilder.php
+    - message: '#TYPO3\\CMS\\Core\\Http\\JsonResponse#'
+      path: Classes/Middleware/UriBuilder.php
 
   reportUnmatchedIgnoredErrors: false