diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 85418d3..f6d7b23 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -3,7 +3,7 @@ name: Checks
 on:
   push:
     branches:
-      - master
+      - "*.x"
   pull_request:
 
 jobs:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d77518..c3b8230 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - "*.x"
   pull_request:
 
 jobs:
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
 
     steps:
       - name: Checkout code
@@ -25,15 +25,10 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Install PHP 7 dependencies
-        run: composer update --prefer-dist --no-interaction --no-progress
-        if: "startsWith(matrix.php, '7.')"
-
-      - name: Install PHP 8 dependencies
+      - name: Install dependencies
         run: |
-          composer require "phpdocumentor/reflection-docblock:^5.2@dev" --no-interaction --no-update
-          composer update --prefer-dist --prefer-stable --no-interaction --no-progress --ignore-platform-req=php
-        if: "startsWith(matrix.php, '8.')"
+          composer update --prefer-dist --no-interaction --no-progress
+          vendor/bin/simple-phpunit install
 
       - name: Execute tests
         run: composer test
@@ -61,6 +56,7 @@ jobs:
           wget https://github.com/puli/cli/releases/download/1.0.0-beta9/puli.phar && chmod +x puli.phar
           composer require "sebastian/comparator:^3.0.2" "puli/composer-plugin:1.0.0-beta9" --no-interaction --no-update
           composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress
+          vendor/bin/simple-phpunit install
 
       - name: Execute tests
         run: composer test
diff --git a/.github/workflows/installation.yml b/.github/workflows/installation.yml
index c686136..25a563a 100644
--- a/.github/workflows/installation.yml
+++ b/.github/workflows/installation.yml
@@ -2,7 +2,7 @@ name: Installation
 on:
   push:
     branches:
-      - master
+      - "*.x"
   pull_request:
 
 jobs:
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index 6602807..cabdb5d 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -3,7 +3,7 @@ name: Static analysis
 on:
   push:
     branches:
-      - master
+      - "*.x"
   pull_request:
 
 jobs:
diff --git a/.gitignore b/.gitignore
index 965a6e8..a5e1b17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /puli.json
 /vendor/
 .php-cs-fixer.cache
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
index 42d6260..4668fbe 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "php-http/discovery",
     "description": "Finds installed HTTPlug implementations and PSR-7 message factories",
     "license": "MIT",
-    "keywords": ["http", "discovery", "client", "adapter", "message", "factory", "psr7"],
+    "keywords": ["http", "discovery", "client", "adapter", "message", "factory", "psr7", "psr17"],
     "homepage": "http://php-http.org",
     "authors": [
         {
@@ -17,7 +17,8 @@
         "graham-campbell/phpspec-skip-example-extension": "^5.0",
         "php-http/httplug": "^1.0 || ^2.0",
         "php-http/message-factory": "^1.0",
-        "phpspec/phpspec": "^5.1 || ^6.1"
+        "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3",
+        "symfony/phpunit-bridge": "^6.2"
     },
     "suggest": {
         "php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories"
@@ -33,14 +34,12 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpspec run",
+        "test": [
+            "vendor/bin/phpspec run",
+            "vendor/bin/simple-phpunit --group NothingInstalled"
+        ],
         "test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.9-dev"
-        }
-    },
     "conflict": {
         "nyholm/psr7": "<1.0"
     },
diff --git a/src/Exception.php b/src/Exception.php
index 58b0523..0fa8c76 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -2,13 +2,11 @@
 
 namespace Http\Discovery;
 
-use Throwable;
-
 /**
  * An interface implemented by all discovery related exceptions.
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-interface Exception extends Throwable
+interface Exception extends \Throwable
 {
 }
diff --git a/src/Strategy/PuliBetaStrategy.php b/src/Strategy/PuliBetaStrategy.php
index c1e1fb7..6b3a862 100644
--- a/src/Strategy/PuliBetaStrategy.php
+++ b/src/Strategy/PuliBetaStrategy.php
@@ -11,6 +11,7 @@
  * Find candidates using Puli.
  *
  * @internal
+ *
  * @final
  *
  * @author David de Boer <david@ddeboer.nl>