diff --git a/composer.json b/composer.json
index 8d3aec87..e6fc6818 100644
--- a/composer.json
+++ b/composer.json
@@ -10,14 +10,14 @@
         }
     ],
     "require": {
-        "illuminate/support": "5.7.*||5.8.*",
+        "illuminate/support": "5.8.*||5.7.*",
         "webpatser/laravel-uuid": "^3.0",
         "predis/predis": "^1.1"
     },
     "require-dev": {
         "vlucas/phpdotenv": "^2.2||^3.3",
         "psy/psysh": "@stable",
-        "laravel/framework": "5.7.*||5.8.*",
+        "laravel/framework": "5.8.*||5.7.*",
         "orchestra/testbench": "~3.7||~3.8",
         "league/flysystem-aws-s3-v3": "~1.0"
     },
diff --git a/docker-compose.yml b/docker-compose.yml
index afa91367..3f1575c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,10 +13,12 @@ services:
             - .:/var/www/html
         environment:
             DOCKER: 1
-            DB_PASSWORD: "password"
-            TENANCY_TEST_REDIS_HOST: "redis"
-            TENANCY_TEST_MYSQL_HOST: "mysql"
-            TENANCY_TEST_PGSQL_HOST: "postgres"
+            DB_PASSWORD: password
+            DB_USERNAME: root
+            DB_DATABASE: main
+            TENANCY_TEST_REDIS_HOST: redis
+            TENANCY_TEST_MYSQL_HOST: mysql
+            TENANCY_TEST_PGSQL_HOST: postgres
         stdin_open: true
         tty: true
     mysql:
@@ -31,7 +33,7 @@ services:
     postgres:
         image: postgres:11
         environment:
-            POSTGRES_PASSWORD: ""
+            POSTGRES_PASSWORD: password
             POSTGRES_USER: user
             POSTGRES_DB: main
     redis:
diff --git a/src/Traits/BootstrapsTenancy.php b/src/Traits/BootstrapsTenancy.php
index f8441b66..1121cc73 100644
--- a/src/Traits/BootstrapsTenancy.php
+++ b/src/Traits/BootstrapsTenancy.php
@@ -5,7 +5,6 @@ namespace Stancl\Tenancy\Traits;
 use Stancl\Tenancy\CacheManager;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Storage;
-use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Stancl\Tenancy\Exceptions\PhpRedisNotInstalledException;
 
 trait BootstrapsTenancy
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 5d0998e4..fc250f6d 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -53,6 +53,7 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
 
         $app['config']->set([
             'database.redis.client' => 'phpredis',
+            'database.redis.cache.host' => env('TENANCY_TEST_REDIS_HOST', '127.0.0.1'),
             'database.redis.default.host' => env('TENANCY_TEST_REDIS_HOST', '127.0.0.1'),
             'database.redis.tenancy' => [
                 'host' => env('TENANCY_TEST_REDIS_HOST', '127.0.0.1'),
@@ -68,8 +69,8 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
                 'suffix' => '.sqlite',
             ],
             'database.connections.sqlite.database' => ':memory:',
-            'database.connections.mysql.host' => env('TENANCY_TESTING_MYSQL_HOST', '127.0.0.1'),
-            'database.connections.pgsql.host' => env('TENANCY_TESTING_PGSQL_HOST', '127.0.0.1'),
+            'database.connections.mysql.host' => env('TENANCY_TEST_MYSQL_HOST', '127.0.0.1'),
+            'database.connections.pgsql.host' => env('TENANCY_TEST_PGSQL_HOST', '127.0.0.1'),
             'tenancy.filesystem.disks' => [
                 'local',
                 'public',