diff --git a/tests/AbstractTest.php b/tests/AbstractTest.php
deleted file mode 100644
index ffa7a45..0000000
--- a/tests/AbstractTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Tests;
-
-use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
-use ApiPlatform\Symfony\Bundle\Test\Client;
-use App\Entity\User;
-
-class AbstractTest extends ApiTestCase
-{
-    private ?string $token = null;
-
-    public function setUp(): void
-    {
-        self::bootKernel();
-    }
-
-    protected function createClientWithCredentials($token = null): Client
-    {
-        return static::createClient([], ['headers' => ['authorization' => 'Bearer '.$token]]);
-    }
-
-    protected function getToken(User $testUser): string
-    {
-        if ($this->token) {
-            return $this->token;
-        }
-
-        $response = static::createClient()->request('POST', '/api/login', ['json' => ['email' => $testUser->getEmail(), 'password' => $testUser->getPlainPassword()]]);
-
-        $this->assertResponseIsSuccessful();
-        $data = $response->toArray();
-        $this->token = $data['token'];
-
-        return $data['token'];
-    }
-}
diff --git a/tests/AuthenticatedUserTrait.php b/tests/AuthenticatedUserTrait.php
new file mode 100644
index 0000000..733c082
--- /dev/null
+++ b/tests/AuthenticatedUserTrait.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Tests;
+
+use ApiPlatform\Symfony\Bundle\Test\Client;
+use App\Entity\User;
+
+trait AuthenticatedUserTrait
+{
+    public static function createClientWithCredentials(string $token): Client
+    {
+        return static::createClient([], [
+            'headers' => [
+                'authorization' => 'Bearer '.$token,
+            ],
+        ]);
+    }
+
+    public static function getToken(User $testUser): string
+    {
+        $response = static::createClient()->request('POST', '/api/login', [
+            'json' => [
+                'email' => $testUser->getEmail(),
+                'password' => $testUser->getPlainPassword(),
+            ],
+        ]);
+
+        $data = $response->toArray();
+
+        return $data['token'];
+    }
+}
diff --git a/tests/Controller/ConnectorControllerTest.php b/tests/Controller/ConnectorControllerTest.php
index ed49f0a..5f816d5 100644
--- a/tests/Controller/ConnectorControllerTest.php
+++ b/tests/Controller/ConnectorControllerTest.php
@@ -2,16 +2,18 @@
 
 namespace App\Tests\Controller;
 
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use App\Entity\Connector;
 use App\Factory\UserFactory;
-use App\Tests\AbstractTest;
+use App\Tests\AuthenticatedUserTrait;
 use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 
-final class ConnectorControllerTest extends AbstractTest
+final class ConnectorControllerTest extends ApiTestCase
 {
     use ResetDatabase;
     use Factories;
+    use AuthenticatedUserTrait;
 
     public function testGetConnectorCollection(): void
     {
diff --git a/tests/Controller/DomainRefreshControllerTest.php b/tests/Controller/DomainRefreshControllerTest.php
index ca7c0d0..5dc4fec 100644
--- a/tests/Controller/DomainRefreshControllerTest.php
+++ b/tests/Controller/DomainRefreshControllerTest.php
@@ -2,16 +2,18 @@
 
 namespace App\Tests\Controller;
 
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use App\Entity\Domain;
 use App\Factory\UserFactory;
-use App\Tests\AbstractTest;
+use App\Tests\AuthenticatedUserTrait;
 use App\Tests\Service\RDAPServiceTest;
 use PHPUnit\Framework\Attributes\DependsExternal;
 use Zenstruck\Foundry\Test\Factories;
 
-final class DomainRefreshControllerTest extends AbstractTest
+final class DomainRefreshControllerTest extends ApiTestCase
 {
     use Factories;
+    use AuthenticatedUserTrait;
 
     #[DependsExternal(RDAPServiceTest::class, 'testUpdateRdapServers')]
     public function testRegisterDomain(): void
diff --git a/tests/Controller/MeControllerTest.php b/tests/Controller/MeControllerTest.php
index 2084a07..79876c2 100644
--- a/tests/Controller/MeControllerTest.php
+++ b/tests/Controller/MeControllerTest.php
@@ -2,17 +2,19 @@
 
 namespace App\Tests\Controller;
 
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use App\Entity\User;
 use App\Factory\UserFactory;
-use App\Tests\AbstractTest;
+use App\Tests\AuthenticatedUserTrait;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 
-final class MeControllerTest extends AbstractTest
+final class MeControllerTest extends ApiTestCase
 {
     use ResetDatabase;
     use Factories;
+    use AuthenticatedUserTrait;
 
     /**
      * @throws TransportExceptionInterface
diff --git a/tests/Controller/WatchlistControllerTest.php b/tests/Controller/WatchlistControllerTest.php
index e44b574..f2d6603 100644
--- a/tests/Controller/WatchlistControllerTest.php
+++ b/tests/Controller/WatchlistControllerTest.php
@@ -2,17 +2,19 @@
 
 namespace App\Tests\Controller;
 
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use ApiPlatform\Symfony\Bundle\Test\Client;
 use App\Entity\WatchList;
 use App\Factory\UserFactory;
-use App\Tests\AbstractTest;
+use App\Tests\AuthenticatedUserTrait;
 use App\Tests\Service\RDAPServiceTest;
 use PHPUnit\Framework\Attributes\DependsExternal;
 use Zenstruck\Foundry\Test\Factories;
 
-final class WatchlistControllerTest extends AbstractTest
+final class WatchlistControllerTest extends ApiTestCase
 {
     use Factories;
+    use AuthenticatedUserTrait;
 
     public function testGetWatchlistCollection(): void
     {