diff --git a/composer.json b/composer.json
index bd58dc2..aea7279 100644
--- a/composer.json
+++ b/composer.json
@@ -29,9 +29,9 @@
         }
     },
     "autoload-dev": {
-        "classmap": [
-            "tests"
-        ]
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
     },
     "scripts": {
         "post-root-package-install": [
diff --git a/phpunit.xml b/phpunit.xml
index eb05bcf..0b51eeb 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -9,8 +9,12 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory suffix="Test.php">./tests</directory>
+        <testsuite name="Feature Tests">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
+
+        <testsuite name="Unit Tests">
+            <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
new file mode 100644
index 0000000..547152f
--- /dev/null
+++ b/tests/CreatesApplication.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Tests;
+
+use Illuminate\Contracts\Console\Kernel;
+
+trait CreatesApplication
+{
+    /**
+     * Creates the application.
+     *
+     * @return \Illuminate\Foundation\Application
+     */
+    public function createApplication()
+    {
+        $app = require __DIR__.'/../bootstrap/app.php';
+
+        $app->make(Kernel::class)->bootstrap();
+
+        return $app;
+    }
+}
diff --git a/tests/features/PromoterLoginTest.php b/tests/Feature/PromoterLoginTest.php
similarity index 94%
rename from tests/features/PromoterLoginTest.php
rename to tests/Feature/PromoterLoginTest.php
index 090556a..330dff1 100644
--- a/tests/features/PromoterLoginTest.php
+++ b/tests/Feature/PromoterLoginTest.php
@@ -1,10 +1,11 @@
 <?php
 
+namespace Tests\Feature;
+
 use App\User;
+use Tests\TestCase;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class PromoterLoginTest extends TestCase
 {
diff --git a/tests/features/PurchaseTicketsTest.php b/tests/Feature/PurchaseTicketsTest.php
similarity index 98%
rename from tests/features/PurchaseTicketsTest.php
rename to tests/Feature/PurchaseTicketsTest.php
index daa6abe..1aa58ec 100644
--- a/tests/features/PurchaseTicketsTest.php
+++ b/tests/Feature/PurchaseTicketsTest.php
@@ -1,16 +1,16 @@
 <?php
 
+namespace Tests\Feature;
+
 use App\Concert;
+use Tests\TestCase;
 use App\Facades\TicketCode;
 use App\Billing\PaymentGateway;
 use App\Billing\FakePaymentGateway;
 use App\Mail\OrderConfirmationEmail;
 use Illuminate\Support\Facades\Mail;
 use App\Facades\OrderConfirmationNumber;
-use App\OrderConfirmationNumberGenerator;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class PurchaseTicketsTest extends TestCase
 {
diff --git a/tests/features/ViewConcertListingTest.php b/tests/Feature/ViewConcertListingTest.php
similarity index 93%
rename from tests/features/ViewConcertListingTest.php
rename to tests/Feature/ViewConcertListingTest.php
index bfca3cd..d8bac56 100644
--- a/tests/features/ViewConcertListingTest.php
+++ b/tests/Feature/ViewConcertListingTest.php
@@ -1,10 +1,11 @@
 <?php
 
+namespace Tests\Feature;
+
 use App\Concert;
 use Carbon\Carbon;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Tests\TestCase;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class ViewConcertListingTest extends TestCase
 {
diff --git a/tests/features/ViewOrderTest.php b/tests/Feature/ViewOrderTest.php
similarity index 95%
rename from tests/features/ViewOrderTest.php
rename to tests/Feature/ViewOrderTest.php
index 8aa9521..63d964e 100644
--- a/tests/features/ViewOrderTest.php
+++ b/tests/Feature/ViewOrderTest.php
@@ -1,12 +1,13 @@
 <?php
 
+namespace Tests\Feature;
+
 use App\Order;
 use App\Ticket;
 use App\Concert;
 use Carbon\Carbon;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
+use Tests\TestCase;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class ViewOrderTest extends TestCase
 {
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 1eb1af1..3de88c5 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,10 +1,15 @@
 <?php
 
+namespace Tests;
+
+use Exception;
 use App\Exceptions\Handler;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 
-abstract class TestCase extends Illuminate\Foundation\Testing\TestCase
+abstract class TestCase extends \Illuminate\Foundation\Testing\TestCase
 {
+    use CreatesApplication;
+
     /**
      * The base URL to use while testing the application.
      *
@@ -17,20 +22,6 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase
         parent::setUp();
     }
 
-    /**
-     * Creates the application.
-     *
-     * @return \Illuminate\Foundation\Application
-     */
-    public function createApplication()
-    {
-        $app = require __DIR__.'/../bootstrap/app.php';
-
-        $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
-
-        return $app;
-    }
-
     protected function disableExceptionHandling()
     {
         $this->app->instance(ExceptionHandler::class, new class extends Handler {
diff --git a/tests/unit/Billing/FakePaymentGatewayTest.php b/tests/unit/Billing/FakePaymentGatewayTest.php
index ab66b71..81bc466 100644
--- a/tests/unit/Billing/FakePaymentGatewayTest.php
+++ b/tests/unit/Billing/FakePaymentGatewayTest.php
@@ -1,10 +1,9 @@
 <?php
 
+namespace Tests\Unit\Billing;
+
+use Tests\TestCase;
 use App\Billing\FakePaymentGateway;
-use App\Billing\PaymentFailedException;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class FakePaymentGatewayTest extends TestCase
 {
diff --git a/tests/unit/Billing/PaymentGatewayContractTests.php b/tests/unit/Billing/PaymentGatewayContractTests.php
index e1f8b37..0f0f324 100644
--- a/tests/unit/Billing/PaymentGatewayContractTests.php
+++ b/tests/unit/Billing/PaymentGatewayContractTests.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests\Unit\Billing;
+
 use App\Billing\PaymentFailedException;
 
 trait PaymentGatewayContractTests
diff --git a/tests/unit/Billing/StripePaymentGatewayTest.php b/tests/unit/Billing/StripePaymentGatewayTest.php
index 07ec889..974b84f 100644
--- a/tests/unit/Billing/StripePaymentGatewayTest.php
+++ b/tests/unit/Billing/StripePaymentGatewayTest.php
@@ -1,7 +1,9 @@
 <?php
 
+namespace Tests\Unit\Billing;
+
+use Tests\TestCase;
 use App\Billing\StripePaymentGateway;
-use App\Billing\PaymentFailedException;
 
 /**
  * @group integration
diff --git a/tests/unit/ConcertTest.php b/tests/unit/ConcertTest.php
index 06353cd..baf58c0 100644
--- a/tests/unit/ConcertTest.php
+++ b/tests/unit/ConcertTest.php
@@ -1,13 +1,14 @@
 <?php
 
+namespace Tests\Unit;
+
 use App\Order;
 use App\Ticket;
 use App\Concert;
 use Carbon\Carbon;
+use Tests\TestCase;
 use App\Exceptions\NotEnoughTicketsException;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class ConcertTest extends TestCase
 {
diff --git a/tests/unit/HashidsTicketCodeGeneratorTest.php b/tests/unit/HashidsTicketCodeGeneratorTest.php
index 12f0bc2..6654181 100644
--- a/tests/unit/HashidsTicketCodeGeneratorTest.php
+++ b/tests/unit/HashidsTicketCodeGeneratorTest.php
@@ -1,10 +1,10 @@
 <?php
 
+namespace Tests\Unit;
+
 use App\Ticket;
+use Tests\TestCase;
 use App\HashidsTicketCodeGenerator;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class HashidsTicketCodeGeneratorTest extends TestCase
 {
diff --git a/tests/unit/Mail/OrderConfirmationEmailTest.php b/tests/unit/Mail/OrderConfirmationEmailTest.php
index 5ed51a6..e948edc 100644
--- a/tests/unit/Mail/OrderConfirmationEmailTest.php
+++ b/tests/unit/Mail/OrderConfirmationEmailTest.php
@@ -1,10 +1,10 @@
 <?php
 
+namespace Tests\Unit\Mail;
+
 use App\Order;
+use Tests\TestCase;
 use App\Mail\OrderConfirmationEmail;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class OrderConfirmationEmailTest extends TestCase
 {
diff --git a/tests/unit/OrderTest.php b/tests/unit/OrderTest.php
index c2fa129..3f1abf2 100644
--- a/tests/unit/OrderTest.php
+++ b/tests/unit/OrderTest.php
@@ -1,13 +1,13 @@
 <?php
 
+namespace Tests\Unit;
+
+use Mockery;
 use App\Order;
 use App\Ticket;
-use App\Concert;
-use App\Reservation;
+use Tests\TestCase;
 use App\Billing\Charge;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class OrderTest extends TestCase
diff --git a/tests/unit/RandomOrderConfirmationNumberGeneratorTest.php b/tests/unit/RandomOrderConfirmationNumberGeneratorTest.php
index 3e9065a..ea58a96 100644
--- a/tests/unit/RandomOrderConfirmationNumberGeneratorTest.php
+++ b/tests/unit/RandomOrderConfirmationNumberGeneratorTest.php
@@ -1,9 +1,9 @@
 <?php
 
+namespace Tests\Unit;
+
+use Tests\TestCase;
 use App\RandomOrderConfirmationNumberGenerator;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class RandomOrderConfirmationNumberGeneratorTest extends TestCase
 {
diff --git a/tests/unit/ReservationTest.php b/tests/unit/ReservationTest.php
index 9205435..e5f3001 100644
--- a/tests/unit/ReservationTest.php
+++ b/tests/unit/ReservationTest.php
@@ -1,12 +1,14 @@
 <?php
 
+namespace Tests\Unit;
+
+use Mockery;
 use App\Ticket;
 use App\Concert;
+use Tests\TestCase;
 use App\Reservation;
 use App\Billing\FakePaymentGateway;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class ReservationTest extends TestCase
 {
diff --git a/tests/unit/TicketTest.php b/tests/unit/TicketTest.php
index e52ff3b..4da24ea 100644
--- a/tests/unit/TicketTest.php
+++ b/tests/unit/TicketTest.php
@@ -1,13 +1,12 @@
 <?php
 
+namespace Tests\Unit;
+
 use App\Order;
 use App\Ticket;
-use App\Concert;
-use Carbon\Carbon;
+use Tests\TestCase;
 use App\Facades\TicketCode;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 class TicketTest extends TestCase
 {