diff --git a/module/Rest/test/Action/CreateShortCodeActionTest.php b/module/Rest/test/Action/ShortCode/CreateShortCodeActionTest.php
similarity index 98%
rename from module/Rest/test/Action/CreateShortCodeActionTest.php
rename to module/Rest/test/Action/ShortCode/CreateShortCodeActionTest.php
index a75a248a..3ac5ad33 100644
--- a/module/Rest/test/Action/CreateShortCodeActionTest.php
+++ b/module/Rest/test/Action/ShortCode/CreateShortCodeActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
diff --git a/module/Rest/test/Action/EditShortCodeActionTest.php b/module/Rest/test/Action/ShortCode/EditShortCodeActionTest.php
similarity index 98%
rename from module/Rest/test/Action/EditShortCodeActionTest.php
rename to module/Rest/test/Action/ShortCode/EditShortCodeActionTest.php
index e4107b8b..e96ccdf8 100644
--- a/module/Rest/test/Action/EditShortCodeActionTest.php
+++ b/module/Rest/test/Action/ShortCode/EditShortCodeActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
diff --git a/module/Rest/test/Action/EditShortCodeTagsActionTest.php b/module/Rest/test/Action/ShortCode/EditShortCodeTagsActionTest.php
similarity index 97%
rename from module/Rest/test/Action/EditShortCodeTagsActionTest.php
rename to module/Rest/test/Action/ShortCode/EditShortCodeTagsActionTest.php
index ec5c0cdb..d7eab463 100644
--- a/module/Rest/test/Action/EditShortCodeTagsActionTest.php
+++ b/module/Rest/test/Action/ShortCode/EditShortCodeTagsActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
diff --git a/module/Rest/test/Action/ListShortCodesActionTest.php b/module/Rest/test/Action/ShortCode/ListShortCodesActionTest.php
similarity index 97%
rename from module/Rest/test/Action/ListShortCodesActionTest.php
rename to module/Rest/test/Action/ShortCode/ListShortCodesActionTest.php
index 8905cc66..59912f5a 100644
--- a/module/Rest/test/Action/ListShortCodesActionTest.php
+++ b/module/Rest/test/Action/ShortCode/ListShortCodesActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
diff --git a/module/Rest/test/Action/ResolveUrlActionTest.php b/module/Rest/test/Action/ShortCode/ResolveUrlActionTest.php
similarity index 98%
rename from module/Rest/test/Action/ResolveUrlActionTest.php
rename to module/Rest/test/Action/ShortCode/ResolveUrlActionTest.php
index f4511d65..3761604e 100644
--- a/module/Rest/test/Action/ResolveUrlActionTest.php
+++ b/module/Rest/test/Action/ShortCode/ResolveUrlActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
diff --git a/module/Rest/test/Action/GetVisitsActionTest.php b/module/Rest/test/Action/Visit/GetVisitsActionTest.php
similarity index 98%
rename from module/Rest/test/Action/GetVisitsActionTest.php
rename to module/Rest/test/Action/Visit/GetVisitsActionTest.php
index 692a086f..c6dc03cb 100644
--- a/module/Rest/test/Action/GetVisitsActionTest.php
+++ b/module/Rest/test/Action/Visit/GetVisitsActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action;
+namespace ShlinkioTest\Shlink\Rest\Action\Visit;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;