diff --git a/.forgejo/workflows/phpcs.yml b/.forgejo/workflows/phpcs.yml
index b7cc8f9..3338848 100755
--- a/.forgejo/workflows/phpcs.yml
+++ b/.forgejo/workflows/phpcs.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
-          tools: composer, cs2pr
+          tools: composer
         env:
           runner: self-hosted
 
diff --git a/.forgejo/workflows/phpunit.yml b/.forgejo/workflows/phpunit.yml
index 417558a..45811ca 100644
--- a/.forgejo/workflows/phpunit.yml
+++ b/.forgejo/workflows/phpunit.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
-          tools: composer, phpunit-polyfills
+          tools: composer
         env:
           runner: self-hosted
 
diff --git a/composer.json b/composer.json
index 945c004..a790815 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,8 @@
         "squizlabs/php_codesniffer": "3.*",
         "wp-coding-standards/wpcs": "dev-develop",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
-        "sirbrillig/phpcs-variable-analysis": "^2.11"
+        "sirbrillig/phpcs-variable-analysis": "^2.11",
+        "yoast/phpunit-polyfills": "^3.0"
     },
     "config": {
         "allow-plugins": true