diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index b7cf42e..69adc26 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [7.4, 7.3, 7.2]
+        php: [8.0, 7.4, 7.3, 7.2]
         laravel: [8.*, 7.*, 6.*]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
diff --git a/composer.json b/composer.json
index 9ebf4d2..52c3501 100644
--- a/composer.json
+++ b/composer.json
@@ -20,11 +20,11 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^7.2.5",
+        "php": "^7.2.5|^8.0",
         "laravel/framework": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.3.1",
+        "mockery/mockery": "^1.3.3",
         "illuminate/database": "^6.0|^7.0|^8.0",
         "orchestra/testbench": "^4.0|^5.0|^6.0",
         "doctrine/dbal": "^2.10"
diff --git a/tests/Feature/TeamworkTeamInviteTraitTest.php b/tests/Feature/TeamworkTeamInviteTraitTest.php
index 4ad2e24..aa95938 100644
--- a/tests/Feature/TeamworkTeamInviteTraitTest.php
+++ b/tests/Feature/TeamworkTeamInviteTraitTest.php
@@ -6,8 +6,8 @@
 use Mockery as m;
 use Mpociot\Teamwork\TeamInvite;
 use Mpociot\Teamwork\TeamworkTeam;
+use Mpociot\Teamwork\Tests\Support\User;
 use Mpociot\Teamwork\Tests\TestCase;
-use Mpociot\Teamwork\Tests\User;
 
 class TeamworkTeamInviteTraitTest extends TestCase
 {
diff --git a/tests/Feature/TeamworkTest.php b/tests/Feature/TeamworkTest.php
index 303aeb8..e2d7b79 100644
--- a/tests/Feature/TeamworkTest.php
+++ b/tests/Feature/TeamworkTest.php
@@ -7,8 +7,8 @@
 use Mockery as m;
 use Mpociot\Teamwork\TeamInvite;
 use Mpociot\Teamwork\TeamworkTeam;
+use Mpociot\Teamwork\Tests\Support\User;
 use Mpociot\Teamwork\Tests\TestCase;
-use Mpociot\Teamwork\Tests\User;
 
 class TeamworkTest extends TestCase
 {
diff --git a/tests/Feature/UsedByTeamsTraitTest.php b/tests/Feature/UsedByTeamsTraitTest.php
index fa722fc..38fa10e 100644
--- a/tests/Feature/UsedByTeamsTraitTest.php
+++ b/tests/Feature/UsedByTeamsTraitTest.php
@@ -3,9 +3,9 @@
 namespace Mpociot\Teamwork\Tests\Feature;
 
 use Mpociot\Teamwork\TeamworkTeam;
-use Mpociot\Teamwork\Tests\Task;
+use Mpociot\Teamwork\Tests\Support\Task;
+use Mpociot\Teamwork\Tests\Support\User;
 use Mpociot\Teamwork\Tests\TestCase;
-use Mpociot\Teamwork\Tests\User;
 
 class UsedByTeamsTraitTest extends TestCase
 {
diff --git a/tests/Feature/UserHasTeamsTraitTest.php b/tests/Feature/UserHasTeamsTraitTest.php
index 6206e50..416e5b8 100644
--- a/tests/Feature/UserHasTeamsTraitTest.php
+++ b/tests/Feature/UserHasTeamsTraitTest.php
@@ -4,8 +4,8 @@
 
 use Event;
 use Mpociot\Teamwork\TeamworkTeam;
+use Mpociot\Teamwork\Tests\Support\User;
 use Mpociot\Teamwork\Tests\TestCase;
-use Mpociot\Teamwork\Tests\User;
 
 class UserHasTeamsTraitTest extends TestCase
 {
diff --git a/tests/Feature/UserNotInTeamExceptionTest.php b/tests/Feature/UserNotInTeamExceptionTest.php
index c1cebe5..6eb7080 100644
--- a/tests/Feature/UserNotInTeamExceptionTest.php
+++ b/tests/Feature/UserNotInTeamExceptionTest.php
@@ -3,8 +3,8 @@
 namespace Mpociot\Teamwork\Tests\Feature;
 
 use Mockery as m;
+use Mpociot\Teamwork\Tests\Support\User;
 use Mpociot\Teamwork\Tests\TestCase;
-use Mpociot\Teamwork\Tests\User;
 
 class UserNotInTeamExceptionTest extends TestCase
 {
diff --git a/tests/models/Task.php b/tests/Support/Task.php
similarity index 76%
rename from tests/models/Task.php
rename to tests/Support/Task.php
index 2b5a452..834d13b 100644
--- a/tests/models/Task.php
+++ b/tests/Support/Task.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Mpociot\Teamwork\Tests;
+namespace Mpociot\Teamwork\Tests\Support;
 
 use Illuminate\Database\Eloquent\Model;
 use Mpociot\Teamwork\Traits\UsedByTeams;
diff --git a/tests/models/User.php b/tests/Support/User.php
similarity index 78%
rename from tests/models/User.php
rename to tests/Support/User.php
index c367d1c..39921c9 100644
--- a/tests/models/User.php
+++ b/tests/Support/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Mpociot\Teamwork\Tests;
+namespace Mpociot\Teamwork\Tests\Support;
 
 use Illuminate\Foundation\Auth\User as Authenticatable;