diff --git a/test/Activities/AcceptHandlerTest.php b/test/ActivityEventHandlers/AcceptHandlerTest.php
similarity index 99%
rename from test/Activities/AcceptHandlerTest.php
rename to test/ActivityEventHandlers/AcceptHandlerTest.php
index c561e5c..674913d 100644
--- a/test/Activities/AcceptHandlerTest.php
+++ b/test/ActivityEventHandlers/AcceptHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\AcceptHandler;
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
diff --git a/test/Activities/AddHandlerTest.php b/test/ActivityEventHandlers/AddHandlerTest.php
similarity index 99%
rename from test/Activities/AddHandlerTest.php
rename to test/ActivityEventHandlers/AddHandlerTest.php
index 1325419..9b15513 100644
--- a/test/Activities/AddHandlerTest.php
+++ b/test/ActivityEventHandlers/AddHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\AddHandler;
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
diff --git a/test/Activities/AnnounceHandlerTest.php b/test/ActivityEventHandlers/AnnounceHandlerTest.php
similarity index 99%
rename from test/Activities/AnnounceHandlerTest.php
rename to test/ActivityEventHandlers/AnnounceHandlerTest.php
index 11dc366..b0da3b8 100644
--- a/test/Activities/AnnounceHandlerTest.php
+++ b/test/ActivityEventHandlers/AnnounceHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\AnnounceHandler;
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
diff --git a/test/Activities/CreateHandlerTest.php b/test/ActivityEventHandlers/CreateHandlerTest.php
similarity index 99%
rename from test/Activities/CreateHandlerTest.php
rename to test/ActivityEventHandlers/CreateHandlerTest.php
index 3c24939..48e7f0f 100644
--- a/test/Activities/CreateHandlerTest.php
+++ b/test/ActivityEventHandlers/CreateHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\CreateHandler;
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
diff --git a/test/Activities/DeleteHandlerTest.php b/test/ActivityEventHandlers/DeleteHandlerTest.php
similarity index 99%
rename from test/Activities/DeleteHandlerTest.php
rename to test/ActivityEventHandlers/DeleteHandlerTest.php
index bd6f033..b91d56a 100644
--- a/test/Activities/DeleteHandlerTest.php
+++ b/test/ActivityEventHandlers/DeleteHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\DeleteHandler;
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
diff --git a/test/Activities/FollowHandlerTest.php b/test/ActivityEventHandlers/FollowHandlerTest.php
similarity index 98%
rename from test/Activities/FollowHandlerTest.php
rename to test/ActivityEventHandlers/FollowHandlerTest.php
index 626ce8f..342465f 100644
--- a/test/Activities/FollowHandlerTest.php
+++ b/test/ActivityEventHandlers/FollowHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\FollowHandler;
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
diff --git a/test/Activities/LikeHandlerTest.php b/test/ActivityEventHandlers/LikeHandlerTest.php
similarity index 99%
rename from test/Activities/LikeHandlerTest.php
rename to test/ActivityEventHandlers/LikeHandlerTest.php
index 4115c6b..5e67520 100644
--- a/test/Activities/LikeHandlerTest.php
+++ b/test/ActivityEventHandlers/LikeHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
 use ActivityPub\ActivityEventHandlers\LikeHandler;
diff --git a/test/Activities/NonActivityHandlerTest.php b/test/ActivityEventHandlers/NonActivityHandlerTest.php
similarity index 98%
rename from test/Activities/NonActivityHandlerTest.php
rename to test/ActivityEventHandlers/NonActivityHandlerTest.php
index addccb5..cafde75 100644
--- a/test/Activities/NonActivityHandlerTest.php
+++ b/test/ActivityEventHandlers/NonActivityHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\NonActivityHandler;
 use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
diff --git a/test/Activities/RemoveHandlerTest.php b/test/ActivityEventHandlers/RemoveHandlerTest.php
similarity index 99%
rename from test/Activities/RemoveHandlerTest.php
rename to test/ActivityEventHandlers/RemoveHandlerTest.php
index f373bdd..085944a 100644
--- a/test/Activities/RemoveHandlerTest.php
+++ b/test/ActivityEventHandlers/RemoveHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
 use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
diff --git a/test/Activities/UpdateHandlerTest.php b/test/ActivityEventHandlers/UpdateHandlerTest.php
similarity index 99%
rename from test/Activities/UpdateHandlerTest.php
rename to test/ActivityEventHandlers/UpdateHandlerTest.php
index 29f61ca..671d4c9 100644
--- a/test/Activities/UpdateHandlerTest.php
+++ b/test/ActivityEventHandlers/UpdateHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
 use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
diff --git a/test/Activities/ValidationHandlerTest.php b/test/ActivityEventHandlers/ValidationHandlerTest.php
similarity index 99%
rename from test/Activities/ValidationHandlerTest.php
rename to test/ActivityEventHandlers/ValidationHandlerTest.php
index 980a187..314eefd 100644
--- a/test/Activities/ValidationHandlerTest.php
+++ b/test/ActivityEventHandlers/ValidationHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Test\Activities;
+namespace ActivityPub\Test\ActivityEventHandlers;
 
 use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
 use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;