diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index f0d8a8b691b8..a508f84c696a 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -19,6 +19,7 @@ parameters:
             - system/Commands/Generators/Views/*
             - system/Debug/Toolbar/Views/toolbar.tpl.php
             - system/Images/Handlers/GDHandler.php
+            - system/Test/Mock/MockCommon.php
             - system/ThirdParty/*
             - system/Validation/Views/single.php
             - tests/system/View/Views/*
diff --git a/utils/phpstan-baseline/arguments.count.neon b/utils/phpstan-baseline/arguments.count.neon
new file mode 100644
index 000000000000..1df396472752
--- /dev/null
+++ b/utils/phpstan-baseline/arguments.count.neon
@@ -0,0 +1,8 @@
+# total 2 errors
+
+parameters:
+    ignoreErrors:
+        -
+            message: '#^Function is_cli invoked with 1 parameter, 0 required\.$#'
+            count: 2
+            path: ../../tests/system/Debug/ToolbarTest.php
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
index 653c78dda08d..461f4d95e0b1 100644
--- a/utils/phpstan-baseline/loader.neon
+++ b/utils/phpstan-baseline/loader.neon
@@ -1,7 +1,8 @@
-# total 2635 errors
+# total 2637 errors
 
 includes:
     - argument.type.neon
+    - arguments.count.neon
     - assign.propertyType.neon
     - booleanNot.exprNotBoolean.neon
     - codeigniter.getReassignArray.neon