diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 7f7164a..5851e9e 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -4,13 +4,13 @@ on: [push, pull_request]
 
 jobs:
     test:
-
-        runs-on: ubuntu-latest
+        runs-on: ${{ matrix.os }}
         strategy:
             fail-fast: true
             matrix:
+                os: [ubuntu-latest]
                 php: [8.0, 7.4, 7.3]
-                laravel: [5.8.*, 6.*, 7.*, 8.*]
+                laravel: [8.*, 7.*, 6.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
                     -   laravel: 8.*
@@ -19,10 +19,8 @@ jobs:
                         testbench: 5.*
                     -   laravel: 6.*
                         testbench: 4.*
-                    -   laravel: 5.8.*
-                        testbench: 3.8.*
 
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
         steps:
             -   name: Checkout code
@@ -35,6 +33,11 @@ jobs:
                     extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
                     coverage: none
 
+            -   name: Setup problem matchers
+                run: |
+                    echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+                    echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
             -   name: Install dependencies
                 run: |
                     composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
diff --git a/composer.json b/composer.json
index e22ca26..717da21 100644
--- a/composer.json
+++ b/composer.json
@@ -20,12 +20,12 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/database": "~5.8.0|^6.0|^7.0|^8.0",
-        "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0"
+        "illuminate/database": "^6.0|^7.0|^8.0",
+        "illuminate/support": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
         "phpunit/phpunit" : "^8.0|^9.0",
-        "orchestra/testbench": "~3.8.0|^4.0|^5.0|^6.0"
+        "orchestra/testbench": "^4.0|^5.0|^6.0"
     },
     "autoload": {
         "psr-4": {