diff --git a/composer.json b/composer.json
index 92c0744..879d0b7 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "test:phpstan": "phpstan",
         "test:cs": "phpcs --colors src",
         "test:cs:fix": "phpcbf --colors src",
-        "test:unit": "phpunit",
+        "test:unit": "phpunit tests/Unit",
         "test": [
             "@test:phpstan",
             "@test:cs",
diff --git a/tests/AbstractCheckpointStorageTestBase.php b/tests/Integration/AbstractCheckpointStorageTestBase.php
similarity index 97%
rename from tests/AbstractCheckpointStorageTestBase.php
rename to tests/Integration/AbstractCheckpointStorageTestBase.php
index 136ef36..19efa59 100644
--- a/tests/AbstractCheckpointStorageTestBase.php
+++ b/tests/Integration/AbstractCheckpointStorageTestBase.php
@@ -1,11 +1,10 @@
 <?php
 declare(strict_types=1);
-namespace Neos\EventStore\Tests;
+namespace Neos\EventStore\Tests\Integration;
 
 use Neos\EventStore\CatchUp\CheckpointStorageInterface;
 use Neos\EventStore\Exception\CheckpointException;
 use Neos\EventStore\Model\Event\SequenceNumber;
-use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/AbstractEventStoreTestBase.php b/tests/Integration/AbstractEventStoreTestBase.php
similarity index 99%
rename from tests/AbstractEventStoreTestBase.php
rename to tests/Integration/AbstractEventStoreTestBase.php
index a74fafd..e05ae32 100644
--- a/tests/AbstractEventStoreTestBase.php
+++ b/tests/Integration/AbstractEventStoreTestBase.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-namespace Neos\EventStore\Tests;
+namespace Neos\EventStore\Tests\Integration;
 
 use Neos\EventStore\EventStoreInterface;
 use Neos\EventStore\Exception\ConcurrencyException;
diff --git a/tests/CatchUp/CatchUpTest.php b/tests/Unit/CatchUp/CatchUpTest.php
similarity index 97%
rename from tests/CatchUp/CatchUpTest.php
rename to tests/Unit/CatchUp/CatchUpTest.php
index 2bde28c..9264259 100644
--- a/tests/CatchUp/CatchUpTest.php
+++ b/tests/Unit/CatchUp/CatchUpTest.php
@@ -1,11 +1,10 @@
 <?php
 declare(strict_types=1);
-namespace Neos\EventStore\Tests\CatchUp;
+namespace Neos\EventStore\Tests\Unit\CatchUp;
 
 
 use Neos\EventStore\CatchUp\CatchUp;
 use Neos\EventStore\CatchUp\CheckpointStorageInterface;
-use Neos\EventStore\Helper\BatchEventStream;
 use Neos\EventStore\Helper\InMemoryEventStream;
 use Neos\EventStore\Model\Event;
 use Neos\EventStore\Model\Event\EventData;
diff --git a/tests/Helper/BatchEventStreamTest.php b/tests/Unit/Helper/BatchEventStreamTest.php
similarity index 98%
rename from tests/Helper/BatchEventStreamTest.php
rename to tests/Unit/Helper/BatchEventStreamTest.php
index 8f2b87a..c70e963 100644
--- a/tests/Helper/BatchEventStreamTest.php
+++ b/tests/Unit/Helper/BatchEventStreamTest.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-namespace Neos\EventStore\Tests\Helper;
+namespace Neos\EventStore\Tests\Unit\Helper;
 
 use Neos\EventStore\Helper\BatchEventStream;
 use Neos\EventStore\Helper\InMemoryEventStream;
diff --git a/tests/Helper/ClosureEventStreamTest.php b/tests/Unit/Helper/ClosureEventStreamTest.php
similarity index 98%
rename from tests/Helper/ClosureEventStreamTest.php
rename to tests/Unit/Helper/ClosureEventStreamTest.php
index 439381b..c03a3a5 100644
--- a/tests/Helper/ClosureEventStreamTest.php
+++ b/tests/Unit/Helper/ClosureEventStreamTest.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-namespace Neos\EventStore\Tests\Helper;
+namespace Neos\EventStore\Tests\Unit\Helper;
 
 use Neos\EventStore\Helper\ClosureEventStream;
 use Neos\EventStore\Model\Event;
diff --git a/tests/Helper/InMemoryCheckpointStorageTest.php b/tests/Unit/Helper/InMemoryCheckpointStorageTest.php
similarity index 83%
rename from tests/Helper/InMemoryCheckpointStorageTest.php
rename to tests/Unit/Helper/InMemoryCheckpointStorageTest.php
index d18558e..38d9207 100644
--- a/tests/Helper/InMemoryCheckpointStorageTest.php
+++ b/tests/Unit/Helper/InMemoryCheckpointStorageTest.php
@@ -1,10 +1,10 @@
 <?php
 declare(strict_types=1);
-namespace Neos\EventStore\Tests\Helper;
+namespace Neos\EventStore\Tests\Unit\Helper;
 
 use Neos\EventStore\CatchUp\CheckpointStorageInterface;
 use Neos\EventStore\Helper\InMemoryCheckpointStorage;
-use Neos\EventStore\Tests\AbstractCheckpointStorageTestBase;
+use Neos\EventStore\Tests\Integration\AbstractCheckpointStorageTestBase;
 use PHPUnit\Framework\Attributes\CoversClass;
 
 #[CoversClass(InMemoryCheckpointStorage::class)]
diff --git a/tests/Helper/InMemoryEventStoreTest.php b/tests/Unit/Helper/InMemoryEventStoreTest.php
similarity index 78%
rename from tests/Helper/InMemoryEventStoreTest.php
rename to tests/Unit/Helper/InMemoryEventStoreTest.php
index 753f364..09bb28d 100644
--- a/tests/Helper/InMemoryEventStoreTest.php
+++ b/tests/Unit/Helper/InMemoryEventStoreTest.php
@@ -1,10 +1,10 @@
 <?php
 declare(strict_types=1);
-namespace Neos\EventStore\Tests\Helper;
+namespace Neos\EventStore\Tests\Unit\Helper;
 
 use Neos\EventStore\EventStoreInterface;
 use Neos\EventStore\Helper\InMemoryEventStore;
-use Neos\EventStore\Tests\AbstractEventStoreTestBase;
+use Neos\EventStore\Tests\Integration\AbstractEventStoreTestBase;
 use PHPUnit\Framework\Attributes\CoversClass;
 
 #[CoversClass(InMemoryEventStore::class)]
diff --git a/tests/Helper/InMemoryEventStreamTest.php b/tests/Unit/Helper/InMemoryEventStreamTest.php
similarity index 96%
rename from tests/Helper/InMemoryEventStreamTest.php
rename to tests/Unit/Helper/InMemoryEventStreamTest.php
index b4b9d96..8e9c199 100644
--- a/tests/Helper/InMemoryEventStreamTest.php
+++ b/tests/Unit/Helper/InMemoryEventStreamTest.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-namespace Neos\EventStore\Tests\Helper;
+namespace Neos\EventStore\Tests\Unit\Helper;
 
 use Neos\EventStore\Helper\InMemoryEventStream;
 use Neos\EventStore\Model\Event;
@@ -17,7 +17,8 @@
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(InMemoryEventStream::class)]
-final class InMemoryEventStreamTest extends TestCase
+final class
+InMemoryEventStreamTest extends TestCase
 {
 
     public static function iteration_dataProvider(): \Generator