diff --git a/.github/settings.yml b/.github/settings.yml
index d8471a79..a521a22a 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -53,6 +53,8 @@ branches:
           - context: "Tests (8.5.19, 8.2, lowest)"
           - context: "Tests (8.5.19, 8.3, highest)"
           - context: "Tests (8.5.19, 8.3, lowest)"
+          - context: "Tests (8.5.40, 8.4, highest)"
+          - context: "Tests (8.5.40, 8.4, lowest)"
           - context: "Tests (9.0.0, 7.3, highest)"
           - context: "Tests (9.0.0, 7.3, lowest)"
           - context: "Tests (9.0.0, 7.4, highest)"
@@ -65,16 +67,22 @@ branches:
           - context: "Tests (9.0.0, 8.2, lowest)"
           - context: "Tests (9.0.0, 8.3, highest)"
           - context: "Tests (9.0.0, 8.3, lowest)"
+          - context: "Tests (9.6.21, 8.4, highest)"
+          - context: "Tests (9.6.21, 8.4, lowest)"
           - context: "Tests (10.0.0, 8.1, highest)"
           - context: "Tests (10.0.0, 8.1, lowest)"
           - context: "Tests (10.0.0, 8.2, highest)"
           - context: "Tests (10.0.0, 8.2, lowest)"
           - context: "Tests (10.0.0, 8.3, highest)"
           - context: "Tests (10.0.0, 8.3, lowest)"
+          - context: "Tests (10.5.35, 8.4, highest)"
+          - context: "Tests (10.5.35, 8.4, lowest)"
           - context: "Tests (11.0.0, 8.2, lowest)"
           - context: "Tests (11.0.0, 8.2, highest)"
           - context: "Tests (11.0.0, 8.3, highest)"
           - context: "Tests (11.0.0, 8.3, lowest)"
+          - context: "Tests (11.3.6, 8.4, highest)"
+          - context: "Tests (11.3.6, 8.4, lowest)"
         strict: false
       restrictions:
 
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index b91e4794..ce484641 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -555,10 +555,18 @@ jobs:
             php-version: "8.3"
             dependencies: "lowest"
 
-          - phpunit-version: "8.5.19"
+          - phpunit-version: "8.5.40"
             php-version: "8.3"
             dependencies: "highest"
 
+          - phpunit-version: "8.5.40"
+            php-version: "8.4"
+            dependencies: "lowest"
+
+          - phpunit-version: "8.5.19"
+            php-version: "8.4"
+            dependencies: "highest"
+
           - phpunit-version: "9.0.0"
             php-version: "7.3"
             dependencies: "lowest"
@@ -607,6 +615,14 @@ jobs:
             php-version: "8.3"
             dependencies: "highest"
 
+          - phpunit-version: "9.6.21"
+            php-version: "8.4"
+            dependencies: "lowest"
+
+          - phpunit-version: "9.6.21"
+            php-version: "8.4"
+            dependencies: "highest"
+
           - phpunit-version: "10.0.0"
             php-version: "8.1"
             dependencies: "lowest"
@@ -631,6 +647,14 @@ jobs:
             php-version: "8.3"
             dependencies: "highest"
 
+          - phpunit-version: "10.5.35"
+            php-version: "8.4"
+            dependencies: "lowest"
+
+          - phpunit-version: "10.5.35"
+            php-version: "8.4"
+            dependencies: "highest"
+
           - phpunit-version: "11.0.0"
             php-version: "8.2"
             dependencies: "lowest"
@@ -647,6 +671,14 @@ jobs:
             php-version: "8.3"
             dependencies: "highest"
 
+          - phpunit-version: "11.3.6"
+            php-version: "8.4"
+            dependencies: "lowest"
+
+          - phpunit-version: "11.3.6"
+            php-version: "8.4"
+            dependencies: "highest"
+
     env:
       PHPUNIT_SLOW_TEST_DETECTOR_PHAR: ".build/phar/phpunit-slow-test-detector.phar"
 
@@ -706,7 +738,7 @@ jobs:
         run: "vendor/bin/phpunit --colors=always --configuration=test/Unit/phpunit.xml"
 
       - name: "Apply patch from https://github.com/sebastianbergmann/phpunit/pull/4486 for phpunit/phpunit:9.0.0"
-        if: "matrix.php-version == '8.3' && matrix.phpunit-version == '9.0.0' && matrix.dependencies == 'lowest'"
+        if: "(matrix.php-version == '8.3' || matrix.php-version == '8.4') && matrix.phpunit-version == '9.0.0' && matrix.dependencies == 'lowest'"
         run: |
           cd vendor/phpunit/phpunit
           wget -O gh-4486.patch https://github.com/sebastianbergmann/phpunit/commit/0a488f22925b3c8732338ef0fbfe7f13cb4cf1d2.patch
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47a18f97..b7ee483c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`2.16.1...main`][2.16.1...main].
 
+### Added
+
+- Added support for PHP 8.4 ([#635]), by [@localheinz]
+
 ## [`2.16.1`][2.16.1]
 
 For a full diff see [`2.16.0...2.16.1`][2.16.0...2.16.1].
@@ -369,6 +373,7 @@ For a full diff see [`7afa59c...1.0.0`][7afa59c...1.0.0].
 [#559]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/559
 [#598]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/598
 [#604]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/604
+[#635]: https://github.com/ergebnis/phpunit-slow-test-detector/pull/635
 
 [@dantleech]: https://github.com/dantleech
 [@HypeMC]: https://github.com/HypeMC