diff --git a/tests/Unit/ConfigCheckoutGatewayTest.php b/tests/Unit/Config/CheckoutGatewayTest.php
similarity index 56%
rename from tests/Unit/ConfigCheckoutGatewayTest.php
rename to tests/Unit/Config/CheckoutGatewayTest.php
index 96fc31d..093dc7f 100644
--- a/tests/Unit/ConfigCheckoutGatewayTest.php
+++ b/tests/Unit/Config/CheckoutGatewayTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Payavel\Checkout\Tests\Unit;
+namespace Payavel\Checkout\Tests\Unit\Config;
 
+use Payavel\Checkout\Tests\Unit\TestCheckoutGateway;
 use Payavel\Orchestration\Tests\Traits\CreatesConfigServiceables;
 use Payavel\Orchestration\Tests\Traits\SetsConfigDriver;
 
-class ConfigCheckoutGatewayTest extends TestCheckoutGateway
+class CheckoutGatewayTest extends TestCheckoutGateway
 {
     use CreatesConfigServiceables;
     use SetsConfigDriver;
diff --git a/tests/Unit/DatabaseCheckoutGatewayTest.php b/tests/Unit/Database/CheckoutGatewayTest.php
similarity index 56%
rename from tests/Unit/DatabaseCheckoutGatewayTest.php
rename to tests/Unit/Database/CheckoutGatewayTest.php
index c7280a5..d68b047 100644
--- a/tests/Unit/DatabaseCheckoutGatewayTest.php
+++ b/tests/Unit/Database/CheckoutGatewayTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Payavel\Checkout\Tests\Unit;
+namespace Payavel\Checkout\Tests\Unit\Database;
 
+use Payavel\Checkout\Tests\Unit\TestCheckoutGateway;
 use Payavel\Orchestration\Tests\Traits\CreatesDatabaseServiceables;
 use Payavel\Orchestration\Tests\Traits\SetsDatabaseDriver;
 
-class DatabaseCheckoutGatewayTest extends TestCheckoutGateway
+class CheckoutGatewayTest extends TestCheckoutGateway
 {
     use CreatesDatabaseServiceables;
     use SetsDatabaseDriver;