diff --git a/.gitignore b/.gitignore
index 10003a427..9ffcf6f89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ clover.xml
 # Ignore PHP CS Fixer local config and cache
 .php_cs
 .php_cs.cache
+
+# Ignore PHPStan local config
+.phpstan.neon
diff --git a/Makefile b/Makefile
index 8627cc4b1..0abe37591 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-export PHPSTAN_VERSION := 0.11.19
+export PHPSTAN_VERSION := 0.12.8
 
 vendor: composer.json
 	composer install
@@ -14,9 +14,9 @@ fmt: vendor
 .PHONY: fmt
 
 phpstan: vendor
-	vendor/bin/phpstan analyse -c phpstan.neon lib tests
+	vendor/bin/phpstan analyse lib tests
 .PHONY: phpstan
 
 phpstan-baseline: vendor
-	vendor/bin/phpstan analyse -c phpstan.neon --error-format baselineNeon lib tests > phpstan-baseline.neon
+	vendor/bin/phpstan analyse --error-format baselineNeon lib tests > phpstan-baseline.neon
 .PHONY: phpstan-baseline
diff --git a/phpstan.neon b/phpstan.neon
deleted file mode 100644
index f68360174..000000000
--- a/phpstan.neon
+++ /dev/null
@@ -1,5 +0,0 @@
-includes:
-	- phpstan-baseline.neon
-
-parameters:
-	level: 1
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
new file mode 100644
index 000000000..5c8f87a9d
--- /dev/null
+++ b/phpstan.neon.dist
@@ -0,0 +1,10 @@
+includes:
+	- phpstan-baseline.neon
+
+parameters:
+	level: 1
+
+	bootstrap: tests/bootstrap.php
+
+	ignoreErrors:
+		- '#Unsafe usage of new static\(\).#'