diff --git a/tests/Feature/AdminHomeControllerTest.php b/tests/Feature/Admin/AdminHomeControllerTest.php
similarity index 79%
rename from tests/Feature/AdminHomeControllerTest.php
rename to tests/Feature/Admin/AdminHomeControllerTest.php
index 20a259e0..e6366d08 100644
--- a/tests/Feature/AdminHomeControllerTest.php
+++ b/tests/Feature/Admin/AdminHomeControllerTest.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Admin;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class AdminHomeControllerTest extends TestCase
 {
diff --git a/tests/Feature/AdminTest.php b/tests/Feature/Admin/AdminTest.php
similarity index 92%
rename from tests/Feature/AdminTest.php
rename to tests/Feature/Admin/AdminTest.php
index 31d4851e..a74cde03 100644
--- a/tests/Feature/AdminTest.php
+++ b/tests/Feature/Admin/AdminTest.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Admin;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class AdminTest extends TestCase
 {
diff --git a/tests/Feature/ArticlesAdminTest.php b/tests/Feature/Admin/ArticlesTest.php
similarity index 97%
rename from tests/Feature/ArticlesAdminTest.php
rename to tests/Feature/Admin/ArticlesTest.php
index 156eeac3..94e52139 100644
--- a/tests/Feature/ArticlesAdminTest.php
+++ b/tests/Feature/Admin/ArticlesTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Admin;
 
 use Tests\TestCase;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class ArticlesAdminTest extends TestCase
+class ArticlesTest extends TestCase
 {
     use DatabaseTransactions;
 
diff --git a/tests/Feature/ClientsAdminTest.php b/tests/Feature/Admin/ClientsTest.php
similarity index 96%
rename from tests/Feature/ClientsAdminTest.php
rename to tests/Feature/Admin/ClientsTest.php
index 8c6fe798..74208927 100644
--- a/tests/Feature/ClientsAdminTest.php
+++ b/tests/Feature/Admin/ClientsTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Admin;
 
 use Tests\TestCase;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class ClientsAdminTest extends TestCase
+class ClientsTest extends TestCase
 {
     use DatabaseTransactions;
 
diff --git a/tests/Feature/ContactsAdminTest.php b/tests/Feature/Admin/ContactsTest.php
similarity index 95%
rename from tests/Feature/ContactsAdminTest.php
rename to tests/Feature/Admin/ContactsTest.php
index 25ce3784..8218309f 100644
--- a/tests/Feature/ContactsAdminTest.php
+++ b/tests/Feature/Admin/ContactsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Admin;
 
 use App\Contact;
 use Tests\TestCase;
@@ -11,7 +11,7 @@ use Illuminate\Http\UploadedFile;
 use GuzzleHttp\Handler\MockHandler;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class ContactsAdminTest extends TestCase
+class ContactsTest extends TestCase
 {
     use DatabaseTransactions;
 
@@ -83,7 +83,7 @@ class ContactsAdminTest extends TestCase
 
     public function test_edit_contact_with_uploaded_avatar()
     {
-        copy(__DIR__ . '/../aaron.png', sys_get_temp_dir() . '/tantek.png');
+        copy(__DIR__ . '/../../aaron.png', sys_get_temp_dir() . '/tantek.png');
         $path = sys_get_temp_dir() . '/tantek.png';
         $file = new UploadedFile($path, 'tantek.png', 'image/png', filesize($path), null, true);
         $this->withSession([
@@ -97,7 +97,7 @@ class ContactsAdminTest extends TestCase
             'avatar' => $file,
         ]);
         $this->assertFileEquals(
-            __DIR__ . '/../aaron.png',
+            __DIR__ . '/../../aaron.png',
             public_path() . '/assets/profile-images/tantek.com/image'
         );
     }
@@ -121,7 +121,7 @@ class ContactsAdminTest extends TestCase
     <img class="u-photo" src="http://tantek.com/tantek.png">
 </div>
 HTML;
-        $file = fopen(__DIR__ . '/../aaron.png', 'r');
+        $file = fopen(__DIR__ . '/../../aaron.png', 'r');
         $mock = new MockHandler([
             new Response(200, ['Content-Type' => 'text/html'], $html),
             new Response(200, ['Content-Type' => 'iamge/png'], $file),
@@ -135,7 +135,7 @@ HTML;
         ])->get('/admin/contacts/1/getavatar');
 
         $this->assertFileEquals(
-            __DIR__ . '/../aaron.png',
+            __DIR__ . '/../../aaron.png',
             public_path() . '/assets/profile-images/tantek.com/image'
         );
     }
diff --git a/tests/Feature/NotesAdminTest.php b/tests/Feature/Admin/NotesTest.php
similarity index 96%
rename from tests/Feature/NotesAdminTest.php
rename to tests/Feature/Admin/NotesTest.php
index c0341263..b7b77757 100644
--- a/tests/Feature/NotesAdminTest.php
+++ b/tests/Feature/Admin/NotesTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Admin;
 
 use Tests\TestCase;
 use App\Jobs\SendWebMentions;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class NotesAdminTest extends TestCase
+class NotesTest extends TestCase
 {
     use DatabaseTransactions;
 
diff --git a/tests/Feature/PlacesAdminTest.php b/tests/Feature/Admin/PlacesTest.php
similarity index 96%
rename from tests/Feature/PlacesAdminTest.php
rename to tests/Feature/Admin/PlacesTest.php
index b348a6be..27c7c6d3 100644
--- a/tests/Feature/PlacesAdminTest.php
+++ b/tests/Feature/Admin/PlacesTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Admin;
 
 use Tests\TestCase;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class PlacesAdminTest extends TestCase
+class PlacesTest extends TestCase
 {
     use DatabaseTransactions;
 
diff --git a/tests/Unit/AddClientToDatabaseJobTest.php b/tests/Unit/Jobs/AddClientToDatabaseJobTest.php
similarity index 95%
rename from tests/Unit/AddClientToDatabaseJobTest.php
rename to tests/Unit/Jobs/AddClientToDatabaseJobTest.php
index 459d0b3c..75d203c6 100644
--- a/tests/Unit/AddClientToDatabaseJobTest.php
+++ b/tests/Unit/Jobs/AddClientToDatabaseJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use Tests\TestCase;
 use App\Jobs\AddClientToDatabase;
diff --git a/tests/Unit/DownloadWebMentionJobTest.php b/tests/Unit/Jobs/DownloadWebMentionJobTest.php
similarity index 99%
rename from tests/Unit/DownloadWebMentionJobTest.php
rename to tests/Unit/Jobs/DownloadWebMentionJobTest.php
index 543cbaea..7fde66bc 100644
--- a/tests/Unit/DownloadWebMentionJobTest.php
+++ b/tests/Unit/Jobs/DownloadWebMentionJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use Tests\TestCase;
 use GuzzleHttp\Client;
diff --git a/tests/Unit/ProcessBookmarkJobTest.php b/tests/Unit/Jobs/ProcessBookmarkJobTest.php
similarity index 98%
rename from tests/Unit/ProcessBookmarkJobTest.php
rename to tests/Unit/Jobs/ProcessBookmarkJobTest.php
index d76bf00f..df309a21 100644
--- a/tests/Unit/ProcessBookmarkJobTest.php
+++ b/tests/Unit/Jobs/ProcessBookmarkJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use App\Bookmark;
 use Tests\TestCase;
diff --git a/tests/Unit/ProcessMediaJobTest.php b/tests/Unit/Jobs/ProcessMediaJobTest.php
similarity index 93%
rename from tests/Unit/ProcessMediaJobTest.php
rename to tests/Unit/Jobs/ProcessMediaJobTest.php
index 1e43972f..ffde5cc8 100644
--- a/tests/Unit/ProcessMediaJobTest.php
+++ b/tests/Unit/Jobs/ProcessMediaJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use Storage;
 use Tests\TestCase;
@@ -24,7 +24,7 @@ class ProcessMediaJobTest extends TestCase
     {
         Storage::fake('s3');
         $manager = app()->make(ImageManager::class);
-        Storage::disk('local')->put('aaron.png', file_get_contents(__DIR__.'/../aaron.png'));
+        Storage::disk('local')->put('aaron.png', file_get_contents(__DIR__.'/../../aaron.png'));
         $job = new ProcessMedia('aaron.png');
         $job->handle($manager);
 
@@ -34,7 +34,7 @@ class ProcessMediaJobTest extends TestCase
     public function test_large_images_have_smaller_files_created()
     {
         $manager = app()->make(ImageManager::class);
-        Storage::disk('local')->put('test-image.jpg', file_get_contents(__DIR__.'/../test-image.jpg'));
+        Storage::disk('local')->put('test-image.jpg', file_get_contents(__DIR__.'/../../test-image.jpg'));
         Storage::fake('s3');
         $job = new ProcessMedia('test-image.jpg');
         $job->handle($manager);
diff --git a/tests/Unit/ProcessWebMentionJobTest.php b/tests/Unit/Jobs/ProcessWebMentionJobTest.php
similarity index 99%
rename from tests/Unit/ProcessWebMentionJobTest.php
rename to tests/Unit/Jobs/ProcessWebMentionJobTest.php
index a631063d..a45c844a 100644
--- a/tests/Unit/ProcessWebMentionJobTest.php
+++ b/tests/Unit/Jobs/ProcessWebMentionJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use App\Note;
 use Tests\TestCase;
diff --git a/tests/Unit/SaveProfileImageJobTest.php b/tests/Unit/Jobs/SaveProfileImageJobTest.php
similarity index 99%
rename from tests/Unit/SaveProfileImageJobTest.php
rename to tests/Unit/Jobs/SaveProfileImageJobTest.php
index 991c2ef1..da4ddf74 100644
--- a/tests/Unit/SaveProfileImageJobTest.php
+++ b/tests/Unit/Jobs/SaveProfileImageJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use Tests\TestCase;
 use GuzzleHttp\Client;
diff --git a/tests/Unit/SendWebMentionJobTest.php b/tests/Unit/Jobs/SendWebMentionJobTest.php
similarity index 99%
rename from tests/Unit/SendWebMentionJobTest.php
rename to tests/Unit/Jobs/SendWebMentionJobTest.php
index 4850a750..f83c87a3 100644
--- a/tests/Unit/SendWebMentionJobTest.php
+++ b/tests/Unit/Jobs/SendWebMentionJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use App\Note;
 use Tests\TestCase;
diff --git a/tests/Unit/SyndicateBookmarkToFacebookJobTest.php b/tests/Unit/Jobs/SyndicateBookmarkToFacebookJobTest.php
similarity index 97%
rename from tests/Unit/SyndicateBookmarkToFacebookJobTest.php
rename to tests/Unit/Jobs/SyndicateBookmarkToFacebookJobTest.php
index 03877722..4e0795cb 100644
--- a/tests/Unit/SyndicateBookmarkToFacebookJobTest.php
+++ b/tests/Unit/Jobs/SyndicateBookmarkToFacebookJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use App\Bookmark;
 use Tests\TestCase;
diff --git a/tests/Unit/SyndicateBookmarkToTwitterJobTest.php b/tests/Unit/Jobs/SyndicateBookmarkToTwitterJobTest.php
similarity index 97%
rename from tests/Unit/SyndicateBookmarkToTwitterJobTest.php
rename to tests/Unit/Jobs/SyndicateBookmarkToTwitterJobTest.php
index c92efa62..6e81fbea 100644
--- a/tests/Unit/SyndicateBookmarkToTwitterJobTest.php
+++ b/tests/Unit/Jobs/SyndicateBookmarkToTwitterJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use App\Bookmark;
 use Tests\TestCase;
diff --git a/tests/Unit/SyndicateNoteToFacebookJobTest.php b/tests/Unit/Jobs/SyndicateNoteToFacebookJobTest.php
similarity index 97%
rename from tests/Unit/SyndicateNoteToFacebookJobTest.php
rename to tests/Unit/Jobs/SyndicateNoteToFacebookJobTest.php
index 57b09315..b9acb4f4 100644
--- a/tests/Unit/SyndicateNoteToFacebookJobTest.php
+++ b/tests/Unit/Jobs/SyndicateNoteToFacebookJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use App\Note;
 use Tests\TestCase;
diff --git a/tests/Unit/SyndicateNoteToTwitterJobTest.php b/tests/Unit/Jobs/SyndicateNoteToTwitterJobTest.php
similarity index 97%
rename from tests/Unit/SyndicateNoteToTwitterJobTest.php
rename to tests/Unit/Jobs/SyndicateNoteToTwitterJobTest.php
index 1621b2b9..3381be9d 100644
--- a/tests/Unit/SyndicateNoteToTwitterJobTest.php
+++ b/tests/Unit/Jobs/SyndicateNoteToTwitterJobTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit;
+namespace Tests\Unit\Jobs;
 
 use App\Note;
 use Tests\TestCase;