diff --git a/tests/Unit/FilterTest.php b/tests/Unit/Model/FilterTest.php
similarity index 99%
rename from tests/Unit/FilterTest.php
rename to tests/Unit/Model/FilterTest.php
index 824f64d..3e0929c 100644
--- a/tests/Unit/FilterTest.php
+++ b/tests/Unit/Model/FilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Opdavies\Tests\GmailFilterBuilder;
+namespace Opdavies\Tests\GmailFilterBuilder\Model;
 
 use Opdavies\GmailFilterBuilder\Model\Filter;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/BuilderTest.php b/tests/Unit/Service/BuilderTest.php
similarity index 95%
rename from tests/Unit/BuilderTest.php
rename to tests/Unit/Service/BuilderTest.php
index b7ccea5..4c40fc2 100644
--- a/tests/Unit/BuilderTest.php
+++ b/tests/Unit/Service/BuilderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Opdavies\Tests\GmailFilterBuilder\Service;
+
 use Opdavies\GmailFilterBuilder\Model\Filter;
 use Opdavies\GmailFilterBuilder\Service\Builder;
 use PHPUnit\Framework\TestCase;