diff --git a/tests/Handler/CompletionHandlerTest.php b/tests/Integration/CompletionHandlerIntegrationTest.php
similarity index 99%
rename from tests/Handler/CompletionHandlerTest.php
rename to tests/Integration/CompletionHandlerIntegrationTest.php
index 3a50363d..0c4bc607 100644
--- a/tests/Handler/CompletionHandlerTest.php
+++ b/tests/Integration/CompletionHandlerIntegrationTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Firehed\PhpLsp\Tests\Handler;
+namespace Firehed\PhpLsp\Tests\Integration;
 
 use Firehed\PhpLsp\Capability\SessionCapabilities;
 use Firehed\PhpLsp\Capability\SessionCapabilitiesProviderInterface;
@@ -41,6 +41,7 @@
 use Firehed\PhpLsp\Resolution\TypeSource\NativeTypeSource;
 use Firehed\PhpLsp\Tests\BuildsKnowledgeStackTrait;
 use Firehed\PhpLsp\Tests\Completion\WiresCompletionSourceTrait;
+use Firehed\PhpLsp\Tests\Handler\OpensDocumentsTrait;
 use Firehed\PhpLsp\Tests\Parser\ProductionSyntaxSource;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -61,7 +62,7 @@
 #[CoversClass(ResolvedTypeOnly::class)]
 #[CoversClass(SymbolCandidates::class)]
 #[CoversClass(VariableCandidates::class)]
-class CompletionHandlerTest extends TestCase
+class CompletionHandlerIntegrationTest extends TestCase
 {
     use BuildsKnowledgeStackTrait;
     use OpensDocumentsTrait;
diff --git a/tests/Handler/DefinitionHandlerTest.php b/tests/Integration/DefinitionHandlerIntegrationTest.php
similarity index 99%
rename from tests/Handler/DefinitionHandlerTest.php
rename to tests/Integration/DefinitionHandlerIntegrationTest.php
index aada7220..dcd892b1 100644
--- a/tests/Handler/DefinitionHandlerTest.php
+++ b/tests/Integration/DefinitionHandlerIntegrationTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Firehed\PhpLsp\Tests\Handler;
+namespace Firehed\PhpLsp\Tests\Integration;
 
 use Firehed\PhpLsp\Document\DocumentManager;
 use Firehed\PhpLsp\Domain\ComposerAutoloadMap;
@@ -16,6 +16,7 @@
 use Firehed\PhpLsp\Resolution\SymbolResolver;
 use Firehed\PhpLsp\Resolution\TypeSource\NativeTypeSource;
 use Firehed\PhpLsp\Tests\BuildsKnowledgeStackTrait;
+use Firehed\PhpLsp\Tests\Handler\OpensDocumentsTrait;
 use Firehed\PhpLsp\Tests\Parser\ProductionSyntaxSource;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
@@ -23,7 +24,7 @@
 #[CoversClass(DefinitionHandler::class)]
 #[CoversClass(ExpressionResolver::class)]
 #[CoversClass(ResolvedTypeOnly::class)]
-class DefinitionHandlerTest extends TestCase
+class DefinitionHandlerIntegrationTest extends TestCase
 {
     use BuildsKnowledgeStackTrait;
     use OpensDocumentsTrait;
diff --git a/tests/Handler/HoverHandlerTest.php b/tests/Integration/HoverHandlerIntegrationTest.php
similarity index 99%
rename from tests/Handler/HoverHandlerTest.php
rename to tests/Integration/HoverHandlerIntegrationTest.php
index 151ecc83..01b0a1a5 100644
--- a/tests/Handler/HoverHandlerTest.php
+++ b/tests/Integration/HoverHandlerIntegrationTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Firehed\PhpLsp\Tests\Handler;
+namespace Firehed\PhpLsp\Tests\Integration;
 
 use Firehed\PhpLsp\Capability\SessionCapabilities;
 use Firehed\PhpLsp\Capability\SessionCapabilitiesProviderInterface;
@@ -19,6 +19,7 @@
 use Firehed\PhpLsp\Resolution\SymbolResolver;
 use Firehed\PhpLsp\Resolution\TypeSource\NativeTypeSource;
 use Firehed\PhpLsp\Tests\BuildsKnowledgeStackTrait;
+use Firehed\PhpLsp\Tests\Handler\OpensDocumentsTrait;
 use Firehed\PhpLsp\Tests\Parser\ProductionSyntaxSource;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -27,7 +28,7 @@
 #[CoversClass(ExpressionResolver::class)]
 #[CoversClass(HoverHandler::class)]
 #[CoversClass(ResolvedTypeOnly::class)]
-class HoverHandlerTest extends TestCase
+class HoverHandlerIntegrationTest extends TestCase
 {
     use BuildsKnowledgeStackTrait;
     use OpensDocumentsTrait;
diff --git a/tests/Handler/SignatureHelpHandlerTest.php b/tests/Integration/SignatureHelpHandlerIntegrationTest.php
similarity index 98%
rename from tests/Handler/SignatureHelpHandlerTest.php
rename to tests/Integration/SignatureHelpHandlerIntegrationTest.php
index 6d7656f0..a50d47c7 100644
--- a/tests/Handler/SignatureHelpHandlerTest.php
+++ b/tests/Integration/SignatureHelpHandlerIntegrationTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Firehed\PhpLsp\Tests\Handler;
+namespace Firehed\PhpLsp\Tests\Integration;
 
 use Firehed\PhpLsp\Document\DocumentManager;
 use Firehed\PhpLsp\Handler\SignatureHelpHandler;
@@ -14,6 +14,7 @@
 use Firehed\PhpLsp\Resolution\SymbolResolver;
 use Firehed\PhpLsp\Resolution\TypeSource\NativeTypeSource;
 use Firehed\PhpLsp\Tests\BuildsKnowledgeStackTrait;
+use Firehed\PhpLsp\Tests\Handler\OpensDocumentsTrait;
 use Firehed\PhpLsp\Tests\Parser\ProductionSyntaxSource;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
@@ -21,7 +22,7 @@
 #[CoversClass(ExpressionResolver::class)]
 #[CoversClass(ResolvedTypeOnly::class)]
 #[CoversClass(SignatureHelpHandler::class)]
-class SignatureHelpHandlerTest extends TestCase
+class SignatureHelpHandlerIntegrationTest extends TestCase
 {
     use BuildsKnowledgeStackTrait;
     use OpensDocumentsTrait;