diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14416c2..176e54f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Composer script for PHP linting
 
 ### Changed
+- Switch from PSR-2 to PSR-12 (#3, #35)
 - Move TypoScript linting to GitHub actions (#14)
 - Move PHP code sniffing to GitHub actions (#13)
 - Move PHP linting to GitHub actions (#12)
diff --git a/Tests/Unit/Controller/TeaControllerTest.php b/Tests/Unit/Controller/TeaControllerTest.php
index 4e517bf..674a043 100644
--- a/Tests/Unit/Controller/TeaControllerTest.php
+++ b/Tests/Unit/Controller/TeaControllerTest.php
@@ -5,11 +5,11 @@ declare(strict_types=1);
 namespace TTN\Tea\Tests\Unit\Controller;
 
 use Nimut\TestingFramework\TestCase\UnitTestCase;
+use Prophecy\Prophecy\ObjectProphecy;
+use Prophecy\Prophecy\ProphecySubjectInterface;
 use TTN\Tea\Controller\TeaController;
 use TTN\Tea\Domain\Model\Product\Tea;
 use TTN\Tea\Domain\Repository\Product\TeaRepository;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\ProphecySubjectInterface;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 use TYPO3\CMS\Fluid\View\TemplateView;
diff --git a/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php b/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
index 9245a91..359f453 100644
--- a/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
+++ b/Tests/Unit/Domain/Repository/Product/TeaRepositoryTest.php
@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace TTN\Tea\Tests\Unit\Domain\Repository\Product;
 
 use Nimut\TestingFramework\TestCase\UnitTestCase;
-use TTN\Tea\Domain\Repository\Product\TeaRepository;
 use Prophecy\Prophecy\ProphecySubjectInterface;
+use TTN\Tea\Domain\Repository\Product\TeaRepository;
 use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 
diff --git a/composer.json b/composer.json
index 42e2cae..d2e1611 100644
--- a/composer.json
+++ b/composer.json
@@ -33,12 +33,12 @@
     },
     "require-dev": {
         "codeception/codeception": "^3.0.3",
-        "friendsofphp/php-cs-fixer": "^2.15.1",
+        "friendsofphp/php-cs-fixer": "^2.16.1",
         "helhum/typo3-composer-setup": "^0.5.4",
         "helmich/typo3-typoscript-lint": "^1.5.0",
         "nimut/testing-framework": "^4.1.5",
         "phpunit/phpunit": "^7.5.14",
-        "squizlabs/php_codesniffer": "^3.4.2",
+        "squizlabs/php_codesniffer": "^3.5.3",
         "typo3/cms-fluid-styled-content": "^9.5"
     },
     "replace": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 6d7204e..3496c1b 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="phpList Coding Standard">
     <description>
-        This standard requires PHP_CodeSniffer >= 3.4.0.
+        This standard requires PHP_CodeSniffer >= 3.5.3.
     </description>
 
     <arg name="colors"/>
     <arg name="extensions" value="php"/>
 
-    <!--The complete PSR-2 rule set-->
-    <rule ref="PSR2"/>
-
     <!--The complete PSR-12 rule set-->
     <rule ref="PSR12"/>