diff --git a/tests/Feature/ChangePasswordTest.php b/tests/Feature/ChangePasswordTest.php
index 2e03cb6..7783b6d 100644
--- a/tests/Feature/ChangePasswordTest.php
+++ b/tests/Feature/ChangePasswordTest.php
@@ -3,11 +3,11 @@
 namespace Tests\Feature\Auth;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ChangePasswordTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_change_password()
diff --git a/tests/Feature/EditMarriagesTest.php b/tests/Feature/EditMarriagesTest.php
index e7a8bda..27c3d61 100644
--- a/tests/Feature/EditMarriagesTest.php
+++ b/tests/Feature/EditMarriagesTest.php
@@ -3,12 +3,12 @@
 namespace Tests\Feature;
 
 use App\Couple;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Tests\TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class EditMarriagesTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_visit_a_marriage_detail_page()
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 4af3bfe..8c76c2e 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -3,7 +3,6 @@
 namespace Tests;
 
 use App\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\BrowserKitTesting\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
@@ -16,7 +15,7 @@ abstract class TestCase extends BaseTestCase
     {
         $userId = \Ramsey\Uuid\Uuid::uuid4()->toString();
         $overrides = array_merge([
-            'id' => $userId,
+            'id'         => $userId,
             'manager_id' => $userId,
         ], $overrides);
 
@@ -25,19 +24,4 @@ abstract class TestCase extends BaseTestCase
 
         return $user;
     }
-
-    /**
-     * Boot the testing helper traits.
-     *
-     * @return void
-     */
-    protected function setUpTraits()
-    {
-        parent::setUpTraits();
-        $uses = array_flip(class_uses_recursive(static::class));
-
-        if (isset($uses[RefreshDatabase::class])) {
-            $this->refreshDatabase();
-        }
-    }
 }
diff --git a/tests/Unit/Helpers/UserPhotoHelperTest.php b/tests/Unit/Helpers/UserPhotoHelperTest.php
index cdd0cb0..df1bbc9 100644
--- a/tests/Unit/Helpers/UserPhotoHelperTest.php
+++ b/tests/Unit/Helpers/UserPhotoHelperTest.php
@@ -4,11 +4,11 @@ namespace Tests\Unit\Helpers;
 
 use App\User;
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class UserPhotoHelperTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_photo_path_function_exists()