diff --git a/tests/Feature/Api/Assets/RequestableAssetsTest.php b/tests/Feature/Api/Assets/RequestableAssetTest.php
similarity index 98%
rename from tests/Feature/Api/Assets/RequestableAssetsTest.php
rename to tests/Feature/Api/Assets/RequestableAssetTest.php
index d90e45f223..a4f3d805a7 100644
--- a/tests/Feature/Api/Assets/RequestableAssetsTest.php
+++ b/tests/Feature/Api/Assets/RequestableAssetTest.php
@@ -7,7 +7,7 @@ use App\Models\Company;
 use App\Models\User;
 use Tests\TestCase;
 
-class RequestableAssetsTest extends TestCase
+class RequestableAssetTest extends TestCase
 {
     public function testViewingRequestableAssetsRequiresCorrectPermission()
     {
diff --git a/tests/Feature/Api/Consumables/ConsumablesIndexTest.php b/tests/Feature/Api/Consumables/ConsumableIndexTest.php
similarity index 97%
rename from tests/Feature/Api/Consumables/ConsumablesIndexTest.php
rename to tests/Feature/Api/Consumables/ConsumableIndexTest.php
index 00fa43da27..8fc4b934a7 100644
--- a/tests/Feature/Api/Consumables/ConsumablesIndexTest.php
+++ b/tests/Feature/Api/Consumables/ConsumableIndexTest.php
@@ -7,7 +7,7 @@ use App\Models\Consumable;
 use App\Models\User;
 use Tests\TestCase;
 
-class ConsumablesIndexTest extends TestCase
+class ConsumableIndexTest extends TestCase
 {
     public function testConsumableIndexAdheresToCompanyScoping()
     {
diff --git a/tests/Feature/Api/Licenses/LicensesIndexTest.php b/tests/Feature/Api/Licenses/LicenseIndexTest.php
similarity index 98%
rename from tests/Feature/Api/Licenses/LicensesIndexTest.php
rename to tests/Feature/Api/Licenses/LicenseIndexTest.php
index 603002a095..c8b081aa46 100644
--- a/tests/Feature/Api/Licenses/LicensesIndexTest.php
+++ b/tests/Feature/Api/Licenses/LicenseIndexTest.php
@@ -7,7 +7,7 @@ use App\Models\License;
 use App\Models\User;
 use Tests\TestCase;
 
-class LicensesIndexTest extends TestCase
+class LicenseIndexTest extends TestCase
 {
     public function testLicensesIndexAdheresToCompanyScoping()
     {
diff --git a/tests/Feature/Api/Users/DeleteUsersTest.php b/tests/Feature/Api/Users/DeleteUserTest.php
similarity index 98%
rename from tests/Feature/Api/Users/DeleteUsersTest.php
rename to tests/Feature/Api/Users/DeleteUserTest.php
index e926311dca..c5ff0a4ac1 100644
--- a/tests/Feature/Api/Users/DeleteUsersTest.php
+++ b/tests/Feature/Api/Users/DeleteUserTest.php
@@ -9,7 +9,7 @@ use App\Models\User;
 use App\Models\LicenseSeat;
 use Tests\TestCase;
 
-class DeleteUsersTest extends TestCase
+class DeleteUserTest extends TestCase
 {
 
 
diff --git a/tests/Feature/Api/Users/UsersSearchTest.php b/tests/Feature/Api/Users/UserSearchTest.php
similarity index 99%
rename from tests/Feature/Api/Users/UsersSearchTest.php
rename to tests/Feature/Api/Users/UserSearchTest.php
index 72f23017f5..fe5849d324 100644
--- a/tests/Feature/Api/Users/UsersSearchTest.php
+++ b/tests/Feature/Api/Users/UserSearchTest.php
@@ -7,7 +7,7 @@ use App\Models\User;
 use Laravel\Passport\Passport;
 use Tests\TestCase;
 
-class UsersSearchTest extends TestCase
+class UserSearchTest extends TestCase
 {
     public function testCanSearchByUserFirstAndLastName()
     {
diff --git a/tests/Feature/Users/DeleteUsersTest.php b/tests/Feature/Users/DeleteUserTest.php
similarity index 98%
rename from tests/Feature/Users/DeleteUsersTest.php
rename to tests/Feature/Users/DeleteUserTest.php
index a9ac1ab1ff..69ac9672a5 100644
--- a/tests/Feature/Users/DeleteUsersTest.php
+++ b/tests/Feature/Users/DeleteUserTest.php
@@ -7,7 +7,7 @@ use App\Models\User;
 use Laravel\Passport\Passport;
 use Tests\TestCase;
 
-class DeleteUsersTest extends TestCase
+class DeleteUserTest extends TestCase
 {