diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4fb81da..f30002e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
index ceb0590..70fd8b1 100644
--- a/.github/workflows/composer-require-checker.yml
+++ b/.github/workflows/composer-require-checker.yml
@@ -32,4 +32,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
index 8150499..cc40daa 100644
--- a/.github/workflows/mutation.yml
+++ b/.github/workflows/mutation.yml
@@ -22,11 +22,12 @@ name: mutation test
 
 jobs:
   mutation:
-    uses: yiisoft/actions/.github/workflows/roave-infection.yml@master
+    uses: yiisoft/actions/.github/workflows/infection.yml@master
     with:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.2']
+        ['8.5']
+      infection-args: "--ignore-msi-with-no-mutations"
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
index 5d6931d..20f7d89 100644
--- a/.github/workflows/rector.yml
+++ b/.github/workflows/rector.yml
@@ -21,4 +21,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.4']
+        ['8.5']
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3818c7..7ffb768 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## 1.2.1 under development
 
 - Enh #45: Improve `HeaderValueHelper` methods' annotations (@vjik)
-- Chg #58: Change PHP constraint in `composer.json` to `7.4.* || 8.0 - 8.4` (@vjik)
+- Chg #58, #60: Change PHP constraint in `composer.json` to `7.4.* || 8.0 - 8.5` (@vjik)
 - Enh #57: Simplify code of `HeaderValueHelper::getSortedValueAndParameters()` (@vjik)
 - Bug #56: Add missed `ext-mbstring` dependency (@vjik)
 - Enh #58: Add return value to closure for `preg_replace_callback()` in `HeaderValueHelper::getParameters()` (@vjik)
diff --git a/README.md b/README.md
index 3b1584b..0c8945b 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ The package provides:
 
 ## Requirements
 
-- PHP 7.4 or higher.
+- PHP 7.4 - 8.5.
 - `mbstring` PHP extension.
 
 ## Installation
diff --git a/composer.json b/composer.json
index dea0391..63cb41f 100644
--- a/composer.json
+++ b/composer.json
@@ -31,16 +31,15 @@
         }
     ],
     "require": {
-        "php": "7.4.* || 8.0 - 8.4",
+        "php": "7.4.* || 8.0 - 8.5",
         "ext-mbstring": "*"
     },
     "require-dev": {
+        "bamarni/composer-bin-plugin": "^1.8.2",
         "maglnet/composer-require-checker": "^3.8 || ^4.3",
         "phpunit/phpunit": "^9.6.22",
         "rector/rector": "^2.0.10",
-        "roave/infection-static-analysis-plugin": "^1.18",
-        "spatie/phpunit-watcher": "^1.23.6",
-        "vimeo/psalm": "^4.30 || ^5.26.1 || ^6.8.8"
+        "spatie/phpunit-watcher": "^1.23.6"
     },
     "autoload": {
         "psr-4": {
@@ -55,11 +54,17 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "infection/extension-installer": true,
+            "bamarni/composer-bin-plugin": true,
             "composer/package-versions-deprecated": true
         }
     },
-    "prefer-stable": true,
+    "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "target-directory": "tools",
+            "forward-command": true
+        }
+    },
     "scripts": {
         "test": "phpunit --testdox --no-interaction",
         "test-watch": "phpunit-watcher watch"
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 0000000..cf452dc
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,2 @@
+/*/vendor
+/*/composer.lock
diff --git a/tools/infection/composer.json b/tools/infection/composer.json
new file mode 100644
index 0000000..18be2ea
--- /dev/null
+++ b/tools/infection/composer.json
@@ -0,0 +1,10 @@
+{
+    "require-dev": {
+        "infection/infection": "^0.26 || ^0.31.9"
+    },
+    "config": {
+        "allow-plugins": {
+            "infection/extension-installer": true
+        }
+    }
+}
diff --git a/tools/psalm/composer.json b/tools/psalm/composer.json
new file mode 100644
index 0000000..4b37abf
--- /dev/null
+++ b/tools/psalm/composer.json
@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "vimeo/psalm": "^4.30 || ^5.26.1 || ^6.8.8"
+    }
+}