diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d831aaf88..036da7efa 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -63,6 +63,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           ini-values: display_errors=off, log_errors=on
+          tools: cs2pr
           extensions: :xdebug, ctype, dom, gd, iconv, ldap, mbstring, reflection, session, simplexml, spl, xml, zlib, memcache, pdo_sqlite, bcmath
         env:
           # https://github.com/shivammathur/setup-php/issues/407#issuecomment-773675741
@@ -78,7 +79,7 @@ jobs:
 
       - name: Lint PHP source files
         run: |
-          composer lint
+          composer lint.checkstyle | cs2pr
 
       - name: Setup environment for PHPUnit
         run: |
diff --git a/composer.json b/composer.json
index e4ff89c6f..47b231610 100644
--- a/composer.json
+++ b/composer.json
@@ -19,9 +19,10 @@
         "symfony/polyfill-php70": "^1.19"
     },
     "require-dev": {
-        "php-parallel-lint/php-parallel-lint": "^1.0.0",
+        "php-parallel-lint/php-parallel-lint": "1.3.0",
         "phpunit/dbunit": "1.3.2",
-        "zf1s/phpunit": "3.7.39"
+        "zf1s/phpunit": "3.7.39",
+        "staabm/annotate-pull-request-from-checkstyle": "1.5.0"
     },
     "autoload": {
         "psr-0": {
@@ -206,6 +207,7 @@
     },
     "scripts": {
         "lint": "parallel-lint --exclude vendor --exclude tests/Zend/Loader/_files/ParseError.php .",
+        "lint.checkstyle": "@lint --checkstyle",
         "test": "phpunit"
     }
 }