diff --git a/module/CLI/test/Command/GenerateShortcodeCommandTest.php b/module/CLI/test/Command/Shortcode/GenerateShortcodeCommandTest.php
similarity index 97%
rename from module/CLI/test/Command/GenerateShortcodeCommandTest.php
rename to module/CLI/test/Command/Shortcode/GenerateShortcodeCommandTest.php
index 011dcb32..43367f31 100644
--- a/module/CLI/test/Command/GenerateShortcodeCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/GenerateShortcodeCommandTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace ShlinkioTest\Shlink\CLI\Command;
+namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
diff --git a/module/CLI/test/Command/GetVisitsCommandTest.php b/module/CLI/test/Command/Shortcode/GetVisitsCommandTest.php
similarity index 98%
rename from module/CLI/test/Command/GetVisitsCommandTest.php
rename to module/CLI/test/Command/Shortcode/GetVisitsCommandTest.php
index 5657a91c..b50ad8af 100644
--- a/module/CLI/test/Command/GetVisitsCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/GetVisitsCommandTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace ShlinkioTest\Shlink\CLI\Command;
+namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
diff --git a/module/CLI/test/Command/ListShortcodesCommandTest.php b/module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php
similarity index 98%
rename from module/CLI/test/Command/ListShortcodesCommandTest.php
rename to module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php
index 1a1884ec..d8e4a685 100644
--- a/module/CLI/test/Command/ListShortcodesCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace ShlinkioTest\Shlink\CLI\Command;
+namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
diff --git a/module/CLI/test/Command/ResolveUrlCommandTest.php b/module/CLI/test/Command/Shortcode/ResolveUrlCommandTest.php
similarity index 98%
rename from module/CLI/test/Command/ResolveUrlCommandTest.php
rename to module/CLI/test/Command/Shortcode/ResolveUrlCommandTest.php
index 06b5d350..06e69b49 100644
--- a/module/CLI/test/Command/ResolveUrlCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/ResolveUrlCommandTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace ShlinkioTest\Shlink\CLI\Command;
+namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
diff --git a/module/CLI/test/Command/ProcessVisitsCommandTest.php b/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php
similarity index 98%
rename from module/CLI/test/Command/ProcessVisitsCommandTest.php
rename to module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php
index 900592e5..f62421ac 100644
--- a/module/CLI/test/Command/ProcessVisitsCommandTest.php
+++ b/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace ShlinkioTest\Shlink\CLI\Command;
+namespace ShlinkioTest\Shlink\CLI\Command\Visit;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;