diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 38ba536..61f36ea 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -4,6 +4,9 @@ name: Lint code
 
 on: ["push","pull_request"]
 
+env:
+  COMPOSER_ROOT_VERSION: 5.x-dev
+
 jobs:
   lint:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3927d35..f309aca 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,6 +4,9 @@ name: Run Tests
 
 on: ["push","pull_request"]
 
+env:
+  COMPOSER_ROOT_VERSION: 5.x-dev
+
 jobs:
   tests:
     runs-on: ${{ matrix.os }}
@@ -11,7 +14,7 @@ jobs:
       fail-fast: true
       matrix:
         os: ["macos-latest","ubuntu-latest","windows-latest"]
-        php: ["8.4","8.3","8.2"]
+        php: ["8.5","8.4","8.3","8.2"]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.os }}
 
diff --git a/alchemy.yml b/alchemy.yml
index de7c266..acc63db 100644
--- a/alchemy.yml
+++ b/alchemy.yml
@@ -52,6 +52,7 @@ actions:
   php:
     extensions: json, zip
     versions:
+      - '8.5'
       - '8.4'
       - '8.3'
       - '8.2'