diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf56001..6365a34 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,10 +7,11 @@ on:
 jobs:
   PHPUnit:
     name: PHPUnit (PHP ${{ matrix.php }})
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         php:
+          - 8.4
           - 8.3
           - 8.2
           - 8.1
@@ -41,10 +42,11 @@ jobs:
 
   PHPStan:
     name: PHPStan (PHP ${{ matrix.php }})
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         php:
+          - 8.4
           - 8.3
           - 8.2
           - 8.1
diff --git a/composer.json b/composer.json
index f2d104f..d14527c 100644
--- a/composer.json
+++ b/composer.json
@@ -19,17 +19,17 @@
         "react/socket": "^1.16"
     },
     "require-dev": {
-        "phpstan/phpstan": "1.10.15 || 1.4.10",
+        "phpstan/phpstan": "1.12.13 || 1.4.10",
         "phpunit/phpunit": "^9.6 || ^7.5",
         "react/async": "^4.3 || ^3.2"
     },
     "autoload": {
-        "psr-4": { 
+        "psr-4": {
             "Clue\\React\\Redis\\": "src/"
         }
     },
     "autoload-dev": {
-        "psr-4": { 
+        "psr-4": {
             "Clue\\Tests\\React\\Redis\\": "tests/"
         }
     }