diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6cb5d2fe..78ac786f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,6 +43,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
 
     steps:
       - name: Checkout.
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
index 1face1f2..2f8aece6 100644
--- a/.github/workflows/composer-require-checker.yml
+++ b/.github/workflows/composer-require-checker.yml
@@ -25,6 +25,6 @@ jobs:
     uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@master
     with:
       php: >-
-        ['8.1', '8.2', '8.3', '8.4']
+        ['8.1', '8.2', '8.3', '8.4', '8.5']
       required-packages: >-
         ['db']
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
index 3a770ea2..c59dee8e 100644
--- a/.github/workflows/mutation.yml
+++ b/.github/workflows/mutation.yml
@@ -34,7 +34,7 @@ jobs:
           - ubuntu-latest
 
         php:
-          - 8.4
+          - 8.5
 
     steps:
       - name: Checkout.
@@ -48,8 +48,8 @@ jobs:
           ini-values: memory_limit=-1
           coverage: pcov
 
-      - name: Update composer.
-        run: composer self-update
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v3
 
       - name: Install db.
         uses: yiisoft/actions/install-packages@master
@@ -59,6 +59,6 @@ jobs:
 
       - name: Run infection.
         run: |
-          vendor/bin/roave-infection-static-analysis-plugin --threads=2 --ignore-msi-with-no-mutations
+          vendor/bin/infection --threads=2 --ignore-msi-with-no-mutations
         env:
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
index 3c670a95..d6a42ee5 100644
--- a/.github/workflows/rector.yml
+++ b/.github/workflows/rector.yml
@@ -24,6 +24,6 @@ jobs:
       token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
     with:
       repository: ${{ github.event.pull_request.head.repo.full_name }}
-      php: '8.4'
+      php: '8.5'
       required-packages: >-
         ['db']
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54f40d4b..7b4dd9df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,7 @@
 - Enh #335: Replace `DbArrayHelper::getColumn()` with `array_column()` (@Tigrov)
 - Bug #338: Explicitly mark nullable parameters (@vjik)
 - Enh #337: Move `JsonExpressionBuilder` and JSON type tests to `yiisoft/db` package (@Tigrov)
-- Chg #339: Change supported PHP versions to `8.1 - 8.4` (@Tigrov)
+- Chg #339, #407: Change supported PHP versions to `8.1 - 8.5` (@Tigrov, @vjik)
 - Chg #339: Change return type of `Command::insertWithReturningPks()` method to `array|false` (@Tigrov)
 - New #319: Add parameters `$ifExists` and `$cascade` to `CommandInterface::dropTable()` and
   `DDLQueryBuilderInterface::dropTable()` methods (@vjik)
diff --git a/README.md b/README.md
index 0dd99d73..28450ddb 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Driver supports SQLite 3 or higher.
 
 ## Requirements
 
-- PHP 8.1 - 8.4.
+- PHP 8.1 - 8.5.
 - `pdo` PHP extension.
 - `mbstring` PHP extension.
 
diff --git a/composer.json b/composer.json
index f5ce5c87..b9ad9236 100644
--- a/composer.json
+++ b/composer.json
@@ -31,19 +31,18 @@
         }
     ],
     "require": {
-        "php": "8.1 - 8.4",
+        "php": "8.1 - 8.5",
         "ext-mbstring": "*",
         "ext-pdo": "*",
         "yiisoft/db": "dev-master"
     },
     "require-dev": {
+        "bamarni/composer-bin-plugin": "^1.8.3",
         "friendsofphp/php-cs-fixer": "^3.89.1",
         "maglnet/composer-require-checker": "^4.7.1",
         "phpunit/phpunit": "^10.5.45",
         "rector/rector": "^2.0.10",
-        "roave/infection-static-analysis-plugin": "^1.35",
         "spatie/phpunit-watcher": "^1.24",
-        "vimeo/psalm": "^5.26.1 || ^6.8.8",
         "yiisoft/aliases": "^2.0",
         "yiisoft/psr-dummy-provider": "^1.0",
         "yiisoft/test-support": "^3.0",
@@ -63,9 +62,16 @@
             "Yiisoft\\Db\\Tests\\": "vendor/yiisoft/db/tests"
         }
     },
+    "extra": {
+        "bamarni-bin": {
+            "bin-links": true,
+            "target-directory": "tools",
+            "forward-command": true
+        }
+    },
     "config": {
         "allow-plugins": {
-            "infection/extension-installer": true,
+            "bamarni/composer-bin-plugin": true,
             "composer/package-versions-deprecated": true
         },
         "sort-packages": true
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 00000000..cf452dcf
--- /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 00000000..18be2ea1
--- /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 00000000..44e11e3e
--- /dev/null
+++ b/tools/psalm/composer.json
@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "vimeo/psalm": "^5.26.1 || ^6.8.8"
+    }
+}