diff --git a/composer.json b/composer.json
index d8b31e1..b724a9d 100644
--- a/composer.json
+++ b/composer.json
@@ -16,11 +16,14 @@
     "require-dev": {
         "codedungeon/phpunit-result-printer": "^0.4.4",
         "fzaninotto/faker": "~1.4",
-        "laravel/laravel": "5.5.*",
         "mockery/mockery": "0.9.*",
-        "phpmd/phpmd": "^2.6",
-        "phpunit/phpunit": "5.7.*",
+        "orchestra/database": "^3.5",
+        "orchestra/testbench-browser-kit": "^3.5",
+        "orchestra/testbench-dusk": "3.5.x-dev@dev",
+        "orchestra/testbench": "^3.5",
         "php-coveralls/php-coveralls" : "*",
+        "phpmd/phpmd": "*",
+        "phpunit/phpunit": "*",
         "sebastian/phpcpd": "*",
         "symfony/thanks": "^1.0"
     },
diff --git a/phpunit.xml b/phpunit.xml
index 2be4735..ebd5c58 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,6 +13,10 @@
     syntaxCheck="false"
 >
 <testsuites>
+    <testsuite name="Browser">
+        <directory suffix="Test.php">./tests/Browser</directory>
+    </testsuite>
+
     <testsuite name="Feature">
         <directory suffix="Test.php">./tests/Feature</directory>
     </testsuite>
@@ -29,10 +33,10 @@
     <php>
         <env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
         <env name="APP_ENV" value="testing"/>
+        <env name="APP_URL" value="http://127.0.0.1:8000"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="DB_CONNECTION" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/>
+        <env name="DB_CONNECTION" value="testing"/>
     </php>
 </phpunit>
diff --git a/tests/BrowserTestCase.php b/tests/BrowserTestCase.php
new file mode 100644
index 0000000..4e665e3
--- /dev/null
+++ b/tests/BrowserTestCase.php
@@ -0,0 +1,18 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests;
+
+use Orchestra\Testbench\Dusk\TestCase as BaseTestCase;
+
+abstract class BrowserTestCase extends BaseTestCase
+{
+    use CreatesApplication;
+
+    public static function setUpBeforeClass()
+    {
+        static::serve();
+    }
+
+    public static function tearDownAfterClass()
+    {
+         static::stopServing();
+    }
+}
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index 9c275d3..43c3730 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -1,21 +1,26 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests;
 
 use GeneaLabs\LaravelModelCaching\Providers\Service as LaravelModelCachingService;
-use Illuminate\Contracts\Console\Kernel;
-use Illuminate\Database\Eloquent\Factory;
+use Orchestra\Database\ConsoleServiceProvider;
 
 trait CreatesApplication
 {
-    public function createApplication()
+    public function setUp()
     {
-        $app = require __DIR__ . '/../vendor/laravel/laravel/bootstrap/app.php';
-        $app->make(Kernel::class)->bootstrap();
-        $app->make(Factory::class)->load(__DIR__ . '/database/factories');
-        $app->afterResolving('migrator', function ($migrator) {
-            $migrator->path(__DIR__ . '/database/migrations');
-        });
-        $app->register(LaravelModelCachingService::class);
+        parent::setUp();
 
-        return $app;
+        $this->withFactories(__DIR__ . '/database/factories');
+        $this->loadMigrationsFrom(realpath(__DIR__ . '/database/migrations'));
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function getPackageProviders($app)
+    {
+        return [
+            LaravelModelCachingService::class,
+            ConsoleServiceProvider::class,
+        ];
     }
 }
diff --git a/tests/FeatureTestCase.php b/tests/FeatureTestCase.php
new file mode 100644
index 0000000..c68771a
--- /dev/null
+++ b/tests/FeatureTestCase.php
@@ -0,0 +1,8 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests;
+
+use Orchestra\Testbench\BrowserKit\TestCase as BaseTestCase;
+
+abstract class FeatureTestCase extends BaseTestCase
+{
+    use CreatesApplication;
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
deleted file mode 100644
index c08fecf..0000000
--- a/tests/TestCase.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php namespace GeneaLabs\LaravelModelCaching\Tests;
-
-use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
-
-abstract class TestCase extends BaseTestCase
-{
-    use CreatesApplication;
-}
diff --git a/tests/Unit/CachedBuilderTest.php b/tests/Unit/CachedBuilderTest.php
index 07f421b..01486e7 100644
--- a/tests/Unit/CachedBuilderTest.php
+++ b/tests/Unit/CachedBuilderTest.php
@@ -11,14 +11,14 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources\Author as AuthorResource;
-use GeneaLabs\LaravelModelCaching\Tests\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
 * @SuppressWarnings(PHPMD.TooManyPublicMethods)
 * @SuppressWarnings(PHPMD.TooManyMethods)
  */
-class CachedBuilderTest extends TestCase
+class CachedBuilderTest extends UnitTestCase
 {
     use RefreshDatabase;
 
diff --git a/tests/Unit/CachedModelTest.php b/tests/Unit/CachedModelTest.php
index eb48379..bb7da18 100644
--- a/tests/Unit/CachedModelTest.php
+++ b/tests/Unit/CachedModelTest.php
@@ -10,10 +10,10 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
-use GeneaLabs\LaravelModelCaching\Tests\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class CachedModelTest extends TestCase
+class CachedModelTest extends UnitTestCase
 {
     use RefreshDatabase;
 
diff --git a/tests/Unit/Console/Commands/FlushTest.php b/tests/Unit/Console/Commands/FlushTest.php
index af21653..7c3c49a 100644
--- a/tests/Unit/Console/Commands/FlushTest.php
+++ b/tests/Unit/Console/Commands/FlushTest.php
@@ -6,10 +6,10 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
-use GeneaLabs\LaravelModelCaching\Tests\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class FlushTest extends TestCase
+class FlushTest extends UnitTestCase
 {
     use RefreshDatabase;
 
diff --git a/tests/Unit/DisabledCachedBuilderTest.php b/tests/Unit/DisabledCachedBuilderTest.php
index f6eccd8..3098a10 100644
--- a/tests/Unit/DisabledCachedBuilderTest.php
+++ b/tests/Unit/DisabledCachedBuilderTest.php
@@ -11,14 +11,14 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources\Author as AuthorResource;
-use GeneaLabs\LaravelModelCaching\Tests\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
 * @SuppressWarnings(PHPMD.TooManyPublicMethods)
 * @SuppressWarnings(PHPMD.TooManyMethods)
  */
-class DisabledCachedBuilderTest extends TestCase
+class DisabledCachedBuilderTest extends UnitTestCase
 {
     use RefreshDatabase;
 
diff --git a/tests/Unit/DisabledCachedModelTest.php b/tests/Unit/DisabledCachedModelTest.php
index cae8e60..fbca170 100644
--- a/tests/Unit/DisabledCachedModelTest.php
+++ b/tests/Unit/DisabledCachedModelTest.php
@@ -10,10 +10,10 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
-use GeneaLabs\LaravelModelCaching\Tests\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class DisabledCachedModelTest extends TestCase
+class DisabledCachedModelTest extends UnitTestCase
 {
     use RefreshDatabase;
 
diff --git a/tests/Unit/Traits/CachableTest.php b/tests/Unit/Traits/CachableTest.php
index f1218b7..a3399b6 100644
--- a/tests/Unit/Traits/CachableTest.php
+++ b/tests/Unit/Traits/CachableTest.php
@@ -10,10 +10,10 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
-use GeneaLabs\LaravelModelCaching\Tests\TestCase;
+use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class CachableTest extends TestCase
+class CachableTest extends UnitTestCase
 {
     use RefreshDatabase;
 
diff --git a/tests/UnitTestCase.php b/tests/UnitTestCase.php
new file mode 100644
index 0000000..1aa35d0
--- /dev/null
+++ b/tests/UnitTestCase.php
@@ -0,0 +1,8 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests;
+
+use Orchestra\Testbench\TestCase as BaseTestCase;
+
+abstract class UnitTestCase extends BaseTestCase
+{
+    use CreatesApplication;
+}