diff --git a/Makefile b/Makefile
index 1cb63470..7f9258a6 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,9 @@ coverage-clock:
 coverage-event-dispatcher:
 	XDEBUG_MODE=coverage $(PHP) -dxdebug.mode=coverage $(PHPUNIT) --testsuite event-dispatcher --coverage-html $(COVERAGE_DIR)
 
+coverage-event-sourcing:
+	XDEBUG_MODE=coverage $(PHP) -dxdebug.mode=coverage $(PHPUNIT) --testsuite event-sourcing --coverage-html $(COVERAGE_DIR)
+
 coverage-http-factory:
 	XDEBUG_MODE=coverage $(PHP) -dxdebug.mode=coverage $(PHPUNIT) --testsuite http-factory --coverage-html $(COVERAGE_DIR)
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 61c3f26c..3fe5f0dc 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -26,6 +26,10 @@
       <directory>src/SonsOfPHP/Component/EventDispatcher/Tests</directory>
     </testsuite>
 
+    <testsuite name="event-sourcing">
+      <directory>src/SonsOfPHP/Component/EventSourcing/Tests</directory>
+    </testsuite>
+
     <testsuite name="http-factory">
       <directory>src/SonsOfPHP/Component/HttpFactory/Tests</directory>
     </testsuite>
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AbstractAggregateTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AbstractAggregateTest.php
index 7be16b8e..70c228a7 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AbstractAggregateTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AbstractAggregateTest.php
@@ -13,7 +13,9 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregate
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregate
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
  */
 final class AbstractAggregateTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AggregateIdTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AggregateIdTest.php
index 169e5319..32cdc498 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AggregateIdTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AggregateIdTest.php
@@ -14,7 +14,7 @@
  *
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
  */
 final class AggregateIdTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AggregateVersionTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AggregateVersionTest.php
index a607f0fd..ea22f48e 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AggregateVersionTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/AggregateVersionTest.php
@@ -12,7 +12,7 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
  */
 final class AggregateVersionTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/Repository/AggregateRepositoryTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/Repository/AggregateRepositoryTest.php
index e1792675..328da0c6 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/Repository/AggregateRepositoryTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Aggregate/Repository/AggregateRepositoryTest.php
@@ -19,7 +19,16 @@ class Msg extends AbstractMessage {}
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Aggregate\Repository\AggregateRepository
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\Repository\AggregateRepository
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Enricher\MessageEnricher
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregate
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Repository\InMemoryMessageRepository
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\AbstractMessage
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Enricher\Provider\NullMessageEnricherProvider
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessageMetadata
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessagePayload
  */
 final class AggregateRepositoryTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/AbstractMessageTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/AbstractMessageTest.php
index 02eb160b..06d12356 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/AbstractMessageTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/AbstractMessageTest.php
@@ -17,7 +17,11 @@ class Msg extends AbstractMessage {}
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Message\AbstractMessage
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\AbstractMessage
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessageMetadata
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessagePayload
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
  */
 final class AbstractMessageTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/AbstractSerializableMessageTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/AbstractSerializableMessageTest.php
index 3b242f95..9ff56ff8 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/AbstractSerializableMessageTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/AbstractSerializableMessageTest.php
@@ -14,7 +14,11 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Message\AbstractSerializableMessage
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\AbstractMessage
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessageMetadata
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessagePayload
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
  */
 final class AbstractSerializableMessageTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Enricher/MessageEnricherTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Enricher/MessageEnricherTest.php
index 9bf8623c..8f87ef2d 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Enricher/MessageEnricherTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Enricher/MessageEnricherTest.php
@@ -15,7 +15,10 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Message\Enricher\MessageEnricher
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Enricher\MessageEnricher
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Enricher\Provider\NullMessageEnricherProvider
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Enricher\Handler\NullMessageEnricherHandler
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Enricher\Provider\AllMessageEnricherProvider
  */
 final class MessageEnricherTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/MessageMetadataTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/MessageMetadataTest.php
index 55a757f1..a8207016 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/MessageMetadataTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/MessageMetadataTest.php
@@ -11,7 +11,8 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Message\MessageMetadata
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
  */
 final class MessageMetadataTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/NamespaceMessageProviderTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/NamespaceMessageProviderTest.php
index aa2a6310..e015e1e3 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/NamespaceMessageProviderTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/NamespaceMessageProviderTest.php
@@ -13,7 +13,10 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Message\NamespaceMessageProvider
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\NamespaceMessageProvider
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\AbstractMessage
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessageMetadata
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessagePayload
  */
 final class NamespaceMessageProviderTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Repository/InMemoryMessageRepositoryTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Repository/InMemoryMessageRepositoryTest.php
index 8ce34664..4c8cf63d 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Repository/InMemoryMessageRepositoryTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Repository/InMemoryMessageRepositoryTest.php
@@ -15,7 +15,9 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Message\Repository\InMemoryMessageRepository
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Repository\InMemoryMessageRepository
  */
 final class InMemoryMessageRepositoryTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Serializer/MessageSerializerTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Serializer/MessageSerializerTest.php
index 6a381396..3387fc65 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Serializer/MessageSerializerTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Serializer/MessageSerializerTest.php
@@ -15,7 +15,16 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Message\Serializer\MessageSerializer
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\AbstractMessage
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\AbstractSerializableMessage
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Enricher\Handler\EventTypeMessageEnricherHandler
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Enricher\MessageEnricher
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Enricher\Provider\AllMessageEnricherProvider
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessageMetadata
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\MessagePayload
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Serializer\MessageSerializer
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Upcaster\MessageUpcaster
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Upcaster\Provider\NullMessageUpcasterProvider
  */
 final class MessageSerializerTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Upcaster/MessageUpcasterTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Upcaster/MessageUpcasterTest.php
index 4b751db1..a0ee0c9b 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Upcaster/MessageUpcasterTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Message/Upcaster/MessageUpcasterTest.php
@@ -15,7 +15,10 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Message\Upcaster\MessageUpcaster
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Upcaster\MessageUpcaster
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Upcaster\Provider\NullMessageUpcasterProvider
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Upcaster\Handler\NullUpcasterHandler
+ * @uses \SonsOfPHP\Component\EventSourcing\Message\Upcaster\Provider\EventTypeMessageUpcasterProvider
  */
 final class MessageUpcasterTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Snapshot/Repository/InMemorySnapshotRepositoryTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Snapshot/Repository/InMemorySnapshotRepositoryTest.php
index dfaa936c..c282f950 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Snapshot/Repository/InMemorySnapshotRepositoryTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Snapshot/Repository/InMemorySnapshotRepositoryTest.php
@@ -14,7 +14,9 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Snapshot\Repository\InMemorySnapshotRepository
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
+ * @uses \SonsOfPHP\Component\EventSourcing\Snapshot\Snapshot
  */
 final class InMemorySnapshotRepositoryTest extends TestCase
 {
diff --git a/src/SonsOfPHP/Component/EventSourcing/Tests/Snapshot/SnapshotTest.php b/src/SonsOfPHP/Component/EventSourcing/Tests/Snapshot/SnapshotTest.php
index 4a86735b..59a7b7de 100644
--- a/src/SonsOfPHP/Component/EventSourcing/Tests/Snapshot/SnapshotTest.php
+++ b/src/SonsOfPHP/Component/EventSourcing/Tests/Snapshot/SnapshotTest.php
@@ -13,7 +13,8 @@
 /**
  * @coversDefaultClass \SonsOfPHP\Component\EventSourcing\Snapshot\Snapshot
  *
- * @internal
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AbstractAggregateId
+ * @uses \SonsOfPHP\Component\EventSourcing\Aggregate\AggregateVersion
  */
 final class SnapshotTest extends TestCase
 {