diff --git a/src/Actions/MakeQueueTenantAwareAction.php b/src/Actions/MakeQueueTenantAwareAction.php
index b940dd8..974e2f5 100644
--- a/src/Actions/MakeQueueTenantAwareAction.php
+++ b/src/Actions/MakeQueueTenantAwareAction.php
@@ -2,9 +2,6 @@
 
 namespace Spatie\Multitenancy\Actions;
 
-use Illuminate\Mail\SendQueuedMailable;
-use Illuminate\Notifications\SendQueuedNotifications;
-use Illuminate\Queue\CallQueuedClosure;
 use Illuminate\Queue\Events\JobProcessing;
 use Illuminate\Queue\Events\JobRetryRequested;
 use Illuminate\Support\Arr;
diff --git a/tests/Feature/TenantAwareJobs/QueuedBroadcastEventTest.php b/tests/Feature/TenantAwareJobs/QueuedBroadcastEventTest.php
index e890535..0f406ab 100644
--- a/tests/Feature/TenantAwareJobs/QueuedBroadcastEventTest.php
+++ b/tests/Feature/TenantAwareJobs/QueuedBroadcastEventTest.php
@@ -1,18 +1,13 @@
 <?php
 
-use Illuminate\Auth\Events\Authenticated;
-use Illuminate\Foundation\Auth\User;
 use Illuminate\Support\Facades\Broadcast;
 use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Mail;
 use Spatie\Multitenancy\Exceptions\CurrentTenantCouldNotBeDeterminedInTenantAwareJob;
 use Spatie\Multitenancy\Models\Tenant;
 use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\BroadcastNotTenantAware;
 use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\BroadcastTenantAware;
 use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\ListenerNotTenantAware;
 use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\ListenerTenantAware;
-use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\MailableNotTenantAware;
-use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\MailableTenantAware;
 use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\TestEvent;
 
 beforeEach(function () {
diff --git a/tests/Feature/TenantAwareJobs/QueuedListenerTest.php b/tests/Feature/TenantAwareJobs/QueuedListenerTest.php
index 9b1652e..e5ffee1 100644
--- a/tests/Feature/TenantAwareJobs/QueuedListenerTest.php
+++ b/tests/Feature/TenantAwareJobs/QueuedListenerTest.php
@@ -1,15 +1,10 @@
 <?php
 
-use Illuminate\Auth\Events\Authenticated;
-use Illuminate\Foundation\Auth\User;
 use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Mail;
 use Spatie\Multitenancy\Exceptions\CurrentTenantCouldNotBeDeterminedInTenantAwareJob;
 use Spatie\Multitenancy\Models\Tenant;
 use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\ListenerNotTenantAware;
 use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\ListenerTenantAware;
-use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\MailableNotTenantAware;
-use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\MailableTenantAware;
 use Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses\TestEvent;
 
 beforeEach(function () {
diff --git a/tests/Feature/TenantAwareJobs/TestClasses/BroadcastNotTenantAware.php b/tests/Feature/TenantAwareJobs/TestClasses/BroadcastNotTenantAware.php
index 36b587f..a4d59a4 100644
--- a/tests/Feature/TenantAwareJobs/TestClasses/BroadcastNotTenantAware.php
+++ b/tests/Feature/TenantAwareJobs/TestClasses/BroadcastNotTenantAware.php
@@ -3,17 +3,15 @@
 namespace Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses;
 
 use Illuminate\Broadcasting\Channel;
-use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
 use Spatie\Multitenancy\Jobs\NotTenantAware;
 
 class BroadcastNotTenantAware implements ShouldBroadcast, NotTenantAware
 {
     public function __construct(
         public string $message,
-    ) {}
+    ) {
+    }
 
     public function broadcastOn()
     {
diff --git a/tests/Feature/TenantAwareJobs/TestClasses/BroadcastTenantAware.php b/tests/Feature/TenantAwareJobs/TestClasses/BroadcastTenantAware.php
index 013878c..837a605 100644
--- a/tests/Feature/TenantAwareJobs/TestClasses/BroadcastTenantAware.php
+++ b/tests/Feature/TenantAwareJobs/TestClasses/BroadcastTenantAware.php
@@ -3,18 +3,15 @@
 namespace Spatie\Multitenancy\Tests\Feature\TenantAwareJobs\TestClasses;
 
 use Illuminate\Broadcasting\Channel;
-use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-use Spatie\Multitenancy\Jobs\NotTenantAware;
 use Spatie\Multitenancy\Jobs\TenantAware;
 
 class BroadcastTenantAware implements ShouldBroadcast, TenantAware
 {
     public function __construct(
         public string $message,
-    ) {}
+    ) {
+    }
 
     public function broadcastOn()
     {
diff --git a/tests/Feature/TenantAwareJobs/TestClasses/NotificationNotTenantAware.php b/tests/Feature/TenantAwareJobs/TestClasses/NotificationNotTenantAware.php
index 4383a37..6fc9802 100644
--- a/tests/Feature/TenantAwareJobs/TestClasses/NotificationNotTenantAware.php
+++ b/tests/Feature/TenantAwareJobs/TestClasses/NotificationNotTenantAware.php
@@ -7,7 +7,6 @@
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 use Spatie\Multitenancy\Jobs\NotTenantAware;
-use Spatie\Multitenancy\Jobs\TenantAware;
 
 class NotificationNotTenantAware extends Notification implements ShouldQueue, NotTenantAware
 {
diff --git a/tests/Feature/TenantAwareJobs/TestClasses/TestEvent.php b/tests/Feature/TenantAwareJobs/TestClasses/TestEvent.php
index 77e743c..1288b13 100644
--- a/tests/Feature/TenantAwareJobs/TestClasses/TestEvent.php
+++ b/tests/Feature/TenantAwareJobs/TestClasses/TestEvent.php
@@ -8,9 +8,12 @@
 
 class TestEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
 
     public function __construct(
         public string $message,
-    ) {}
+    ) {
+    }
 }