diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6239b6..98ceb2a 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
@@ -38,7 +39,7 @@ jobs:
 
   PHPUnit-hhvm:
     name: PHPUnit (HHVM)
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
diff --git a/README.md b/README.md
index 3fc401b..6cd2c5b 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ composer install
 To run the test suite, go to the project root and run:
 
 ```bash
-php vendor/bin/phpunit
+vendor/bin/phpunit
 ```
 
 ## License
diff --git a/composer.json b/composer.json
index e5507e4..c6f518c 100644
--- a/composer.json
+++ b/composer.json
@@ -10,16 +10,6 @@
             "email": "christian@clue.engineering"
         }
     ],
-    "autoload": {
-        "psr-4": {
-            "Clue\\React\\Multicast\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Clue\\Tests\\React\\Multicast\\": "tests/"
-        }
-    },
     "require": {
         "php": ">=5.3",
         "react/datagram": "^1.10",
@@ -31,5 +21,15 @@
     },
     "suggest": {
         "ext-sockets": "Requires PHP 5.4+ and the low level socket API for listening on multicast addresses (socket options to send IGMP announcements)"
+    },
+    "autoload": {
+        "psr-4": {
+            "Clue\\React\\Multicast\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Clue\\Tests\\React\\Multicast\\": "tests/"
+        }
     }
 }