diff --git a/test/tests/unit/Message/HeaderCollectionTest.php b/test/tests/unit/Message/HeaderCollectionTest.php
index 03608d1..54055f3 100644
--- a/test/tests/unit/Message/HeaderCollectionTest.php
+++ b/test/tests/unit/Message/HeaderCollectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Test\Message;
+namespace WellRESTed\Test\Unit\Message;
 
 use WellRESTed\Message\HeaderCollection;
 
diff --git a/test/tests/unit/Message/NullStreamTest.php b/test/tests/unit/Message/NullStreamTest.php
index d94d8f1..ec70609 100644
--- a/test/tests/unit/Message/NullStreamTest.php
+++ b/test/tests/unit/Message/NullStreamTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Test\Message;
+namespace WellRESTed\Test\Unit\Message;
 
 use WellRESTed\Message\NullStream;
 
diff --git a/test/tests/unit/Message/StreamTest.php b/test/tests/unit/Message/StreamTest.php
index bd69925..23499a9 100644
--- a/test/tests/unit/Message/StreamTest.php
+++ b/test/tests/unit/Message/StreamTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Test\Message;
+namespace WellRESTed\Test\Unit\Message;
 
 use WellRESTed\Message\Stream;
 
diff --git a/test/tests/unit/Message/UploadedFileTest.php b/test/tests/unit/Message/UploadedFileTest.php
index f4eba7e..0dc92ec 100644
--- a/test/tests/unit/Message/UploadedFileTest.php
+++ b/test/tests/unit/Message/UploadedFileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Test\Message;
+namespace WellRESTed\Test\Unit\Message;
 
 use WellRESTed\Message\UploadedFile;
 use WellRESTed\Message\UploadedFileState;
diff --git a/test/tests/unit/Message/UriTest.php b/test/tests/unit/Message/UriTest.php
index 46ea99a..ad75912 100644
--- a/test/tests/unit/Message/UriTest.php
+++ b/test/tests/unit/Message/UriTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Test\Message;
+namespace WellRESTed\Test\Unit\Message;
 
 use WellRESTed\Message\Uri;
 
diff --git a/test/tests/unit/ServerTest.php b/test/tests/unit/ServerTest.php
index 0499415..5e6fd57 100644
--- a/test/tests/unit/ServerTest.php
+++ b/test/tests/unit/ServerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Test\Unit\Server;
+namespace WellRESTed\Test\Unit;
 
 use Prophecy\Argument;
 use WellRESTed\Message\Response;