diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6b6645..8c5db32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## x.y.z
 
 ### Added
+- Composer script for PHP code sniffer fixing (#21)
 - Run the functional tests in parallel
 - Add PHP-CS-Fixer
 - Add support for PHP 7.3
diff --git a/Classes/Controller/TeaController.php b/Classes/Controller/TeaController.php
index 4282dd0..0467287 100644
--- a/Classes/Controller/TeaController.php
+++ b/Classes/Controller/TeaController.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Controller;
diff --git a/Classes/Domain/Model/Product/Tea.php b/Classes/Domain/Model/Product/Tea.php
index ab09c9e..48804b6 100644
--- a/Classes/Domain/Model/Product/Tea.php
+++ b/Classes/Domain/Model/Product/Tea.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Domain\Model\Product;
diff --git a/Classes/Domain/Repository/Product/TeaRepository.php b/Classes/Domain/Repository/Product/TeaRepository.php
index 7e4c196..7414853 100644
--- a/Classes/Domain/Repository/Product/TeaRepository.php
+++ b/Classes/Domain/Repository/Product/TeaRepository.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Domain\Repository\Product;
diff --git a/Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php b/Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php
index bb65200..2f879b8 100644
--- a/Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php
+++ b/Classes/Domain/Repository/Traits/StoragePageAgnosticTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Domain\Repository\Traits;
diff --git a/Tests/Acceptance/StarterCest.php b/Tests/Acceptance/StarterCest.php
index 901335a..d6e67a0 100644
--- a/Tests/Acceptance/StarterCest.php
+++ b/Tests/Acceptance/StarterCest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Tests\Acceptance;
diff --git a/Tests/Acceptance/_support/AcceptanceTester.php b/Tests/Acceptance/_support/AcceptanceTester.php
index d18fcd4..a42108f 100644
--- a/Tests/Acceptance/_support/AcceptanceTester.php
+++ b/Tests/Acceptance/_support/AcceptanceTester.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**
diff --git a/Tests/Acceptance/_support/Helper/Acceptance.php b/Tests/Acceptance/_support/Helper/Acceptance.php
index 71f67a8..5daf61f 100644
--- a/Tests/Acceptance/_support/Helper/Acceptance.php
+++ b/Tests/Acceptance/_support/Helper/Acceptance.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Helper;
diff --git a/Tests/Functional/Controller/TeaControllerTest.php b/Tests/Functional/Controller/TeaControllerTest.php
index 6b30bdf..e65328b 100644
--- a/Tests/Functional/Controller/TeaControllerTest.php
+++ b/Tests/Functional/Controller/TeaControllerTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Tests\Functional\Controller;
diff --git a/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php b/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php
index 8c3b578..f91f28c 100644
--- a/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php
+++ b/Tests/Functional/Domain/Repository/Product/TeaRepositoryTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Tests\Functional\Domain\Repository\Product;
diff --git a/Tests/Unit/Controller/TeaControllerTest.php b/Tests/Unit/Controller/TeaControllerTest.php
index c5a4a07..4e517bf 100644
--- a/Tests/Unit/Controller/TeaControllerTest.php
+++ b/Tests/Unit/Controller/TeaControllerTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Tests\Unit\Controller;
diff --git a/Tests/Unit/Domain/Model/Product/TeaTest.php b/Tests/Unit/Domain/Model/Product/TeaTest.php
index 461364a..c7377bb 100644
--- a/Tests/Unit/Domain/Model/Product/TeaTest.php
+++ b/Tests/Unit/Domain/Model/Product/TeaTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Tests\Unit\Domain\Model\Product;
diff --git a/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php b/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
index 1f6dfeb..9245a91 100644
--- a/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
+++ b/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TTN\Tea\Tests\Unit\Domain\Repository\Product;
diff --git a/composer.json b/composer.json
index bfbe228..cf5dd89 100644
--- a/composer.json
+++ b/composer.json
@@ -88,6 +88,7 @@
             "@php -r 'file_exists($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/tea\") || symlink(__DIR__,$extFolder);'"
         ],
         "fix:php-cs": "php-cs-fixer fix",
+        "fix:php-sniff": "phpcbf Classes Tests",
         "post-autoload-dump": [
             "@link-extension"
         ]