diff --git a/composer.json b/composer.json
index e7812fd..e7632d2 100644
--- a/composer.json
+++ b/composer.json
@@ -117,7 +117,7 @@
 			"@fix:php:sniff"
 		],
 		"fix:php:cs": "@php ./tools/php-cs-fixer fix --config .php_cs.php",
-		"fix:php:sniff": "@php .Build/vendor/bin/phpcs Classes Configuration Tests",
+		"fix:php:sniff": "@php ./tools/phpcbf Classes Configuration Tests",
 		"link-extension": [
 			"@php -r 'is_dir($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/\") || mkdir($extFolder, 0777, true);'",
 			"@php -r 'file_exists($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/tea\") || symlink(__DIR__,$extFolder);'"
diff --git a/phive.xml b/phive.xml
index 18b4e4d..cb77f5e 100644
--- a/phive.xml
+++ b/phive.xml
@@ -3,6 +3,7 @@
   <phar name="phar-io/phive" version="^0.14.5" location="./tools/phive" copy="true" installed="0.14.5"/>
   <phar name="phpcpd" version="^6.0.3" location="./tools/phpcpd" copy="true" installed="6.0.3"/>
   <phar name="phpcs" version="^3.5.8" location="./tools/phpcs" copy="true" installed="3.5.8"/>
+  <phar name="phpcbf" version="^3.6.0" location="./tools/phpcbf" copy="true" installed="3.6.0"/>
   <phar name="ergebnis/composer-normalize" version="^2.13.2" location="./tools/composer-normalize" copy="true" installed="2.13.2"/>
   <phar name="friendsofphp/php-cs-fixer" version="^2.18.2" location="./tools/php-cs-fixer" copy="true" installed="2.18.2"/>
   <phar name="j13k/yaml-lint" version="^1.1.4" installed="1.1.4" location="./tools/yaml-lint" copy="true"/>
diff --git a/tools/phpcbf b/tools/phpcbf
new file mode 100755
index 0000000..dcf50ad
Binary files /dev/null and b/tools/phpcbf differ