diff --git a/composer.json b/composer.json
index fbc835fef..6b2693d5f 100644
--- a/composer.json
+++ b/composer.json
@@ -214,8 +214,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\Wallabag\\": "tests/",
-            "Wallabag\\DataFixtures\\": "fixtures/"
+            "Wallabag\\DataFixtures\\": "fixtures/",
+            "Wallabag\\Tests\\": "tests/"
         },
         "files": [
             "tests/functions.php"
diff --git a/tests/Command/CleanDuplicatesCommandTest.php b/tests/Command/CleanDuplicatesCommandTest.php
index 3129d0047..cb0d8e9d5 100644
--- a/tests/Command/CleanDuplicatesCommandTest.php
+++ b/tests/Command/CleanDuplicatesCommandTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Command;
+namespace Wallabag\Tests\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
 use Wallabag\Entity\User;
+use Wallabag\Tests\WallabagTestCase;
 
 class CleanDuplicatesCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/ExportCommandTest.php b/tests/Command/ExportCommandTest.php
index 67c11c4ef..d02513e7b 100644
--- a/tests/Command/ExportCommandTest.php
+++ b/tests/Command/ExportCommandTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\Command;
+namespace Wallabag\Tests\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 class ExportCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/GenerateUrlHashesCommandTest.php b/tests/Command/GenerateUrlHashesCommandTest.php
index 73a54e803..a21073bcb 100644
--- a/tests/Command/GenerateUrlHashesCommandTest.php
+++ b/tests/Command/GenerateUrlHashesCommandTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Command;
+namespace Wallabag\Tests\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
 use Wallabag\Entity\User;
+use Wallabag\Tests\WallabagTestCase;
 
 class GenerateUrlHashesCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/Import/ImportCommandTest.php b/tests/Command/Import/ImportCommandTest.php
index 945ca0180..b0f36ff92 100644
--- a/tests/Command/Import/ImportCommandTest.php
+++ b/tests/Command/Import/ImportCommandTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Command\Import;
+namespace Wallabag\Tests\Command\Import;
 
 use Doctrine\ORM\NoResultException;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 class ImportCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/Import/RedisWorkerCommandTest.php b/tests/Command/Import/RedisWorkerCommandTest.php
index e875f6a1e..7aeb379ee 100644
--- a/tests/Command/Import/RedisWorkerCommandTest.php
+++ b/tests/Command/Import/RedisWorkerCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Command\Import;
+namespace Wallabag\Tests\Command\Import;
 
 use M6Web\Component\RedisMock\RedisMockFactory;
 use Predis\Client;
@@ -8,7 +8,7 @@ use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 class RedisWorkerCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/Import/UrlCommandTest.php b/tests/Command/Import/UrlCommandTest.php
index c71c69ba7..7156588ff 100644
--- a/tests/Command/Import/UrlCommandTest.php
+++ b/tests/Command/Import/UrlCommandTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Tests\Wallabag\Command\Import;
+namespace Wallabag\Tests\Command\Import;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NoResultException;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class UrlCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/InstallCommandTest.php b/tests/Command/InstallCommandTest.php
index 9e89e30c1..e1b846c10 100644
--- a/tests/Command/InstallCommandTest.php
+++ b/tests/Command/InstallCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Command;
+namespace Wallabag\Tests\Command;
 
 use DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver;
 use Doctrine\DBAL\Connection;
@@ -14,8 +14,8 @@ use Symfony\Component\Console\Command\LazyCommand;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Command\InstallCommand;
+use Wallabag\Tests\WallabagTestCase;
 
 class InstallCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/ListUserCommandTest.php b/tests/Command/ListUserCommandTest.php
index 24914d35e..b610519ea 100644
--- a/tests/Command/ListUserCommandTest.php
+++ b/tests/Command/ListUserCommandTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\Command;
+namespace Wallabag\Tests\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 class ListUserCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/ReloadEntryCommandTest.php b/tests/Command/ReloadEntryCommandTest.php
index 717702632..db97b8e0c 100644
--- a/tests/Command/ReloadEntryCommandTest.php
+++ b/tests/Command/ReloadEntryCommandTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Command;
+namespace Wallabag\Tests\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
 use Wallabag\Repository\EntryRepository;
 use Wallabag\Repository\UserRepository;
+use Wallabag\Tests\WallabagTestCase;
 
 class ReloadEntryCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/ShowUserCommandTest.php b/tests/Command/ShowUserCommandTest.php
index 23b866d4e..6f830df33 100644
--- a/tests/Command/ShowUserCommandTest.php
+++ b/tests/Command/ShowUserCommandTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Command;
+namespace Wallabag\Tests\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\User;
+use Wallabag\Tests\WallabagTestCase;
 
 class ShowUserCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/TagAllCommandTest.php b/tests/Command/TagAllCommandTest.php
index 3241727ac..160d69643 100644
--- a/tests/Command/TagAllCommandTest.php
+++ b/tests/Command/TagAllCommandTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\Command;
+namespace Wallabag\Tests\Command;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 class TagAllCommandTest extends WallabagTestCase
 {
diff --git a/tests/Command/UpdatePicturesPathCommandTest.php b/tests/Command/UpdatePicturesPathCommandTest.php
index 34c6ec6e4..be348cc3e 100644
--- a/tests/Command/UpdatePicturesPathCommandTest.php
+++ b/tests/Command/UpdatePicturesPathCommandTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Command;
+namespace Wallabag\Tests\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class UpdatePicturesPathCommandTest extends WallabagTestCase
 {
diff --git a/tests/Consumer/AMQPEntryConsumerTest.php b/tests/Consumer/AMQPEntryConsumerTest.php
index c0940298c..dfe0f0b68 100644
--- a/tests/Consumer/AMQPEntryConsumerTest.php
+++ b/tests/Consumer/AMQPEntryConsumerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Consumer;
+namespace Wallabag\Tests\Consumer;
 
 use Doctrine\ORM\EntityManager;
 use PhpAmqpLib\Message\AMQPMessage;
diff --git a/tests/Consumer/RedisEntryConsumerTest.php b/tests/Consumer/RedisEntryConsumerTest.php
index 0d4c6b758..52d2863eb 100644
--- a/tests/Consumer/RedisEntryConsumerTest.php
+++ b/tests/Consumer/RedisEntryConsumerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Consumer;
+namespace Wallabag\Tests\Consumer;
 
 use Doctrine\ORM\EntityManager;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Controller/AnnotationControllerTest.php b/tests/Controller/AnnotationControllerTest.php
index f4339955c..c5d698e19 100644
--- a/tests/Controller/AnnotationControllerTest.php
+++ b/tests/Controller/AnnotationControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Annotation;
 use Wallabag\Entity\Entry;
 use Wallabag\Entity\User;
+use Wallabag\Tests\WallabagTestCase;
 
 class AnnotationControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Api/ConfigRestControllerTest.php b/tests/Controller/Api/ConfigRestControllerTest.php
index d9adcaf14..f8a42bbfa 100644
--- a/tests/Controller/Api/ConfigRestControllerTest.php
+++ b/tests/Controller/Api/ConfigRestControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Api;
+namespace Wallabag\Tests\Controller\Api;
 
 class ConfigRestControllerTest extends WallabagApiTestCase
 {
diff --git a/tests/Controller/Api/DeveloperControllerTest.php b/tests/Controller/Api/DeveloperControllerTest.php
index 11d7f3be5..171c6fa44 100644
--- a/tests/Controller/Api/DeveloperControllerTest.php
+++ b/tests/Controller/Api/DeveloperControllerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Api;
+namespace Wallabag\Tests\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Api\Client;
 use Wallabag\Entity\User;
+use Wallabag\Tests\WallabagTestCase;
 
 class DeveloperControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Api/EntryRestControllerTest.php b/tests/Controller/Api/EntryRestControllerTest.php
index edb379447..d3c15cfe2 100644
--- a/tests/Controller/Api/EntryRestControllerTest.php
+++ b/tests/Controller/Api/EntryRestControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Api;
+namespace Wallabag\Tests\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\DependencyInjection\Container;
diff --git a/tests/Controller/Api/SearchRestControllerTest.php b/tests/Controller/Api/SearchRestControllerTest.php
index 63ef059ec..e742d1297 100644
--- a/tests/Controller/Api/SearchRestControllerTest.php
+++ b/tests/Controller/Api/SearchRestControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Api;
+namespace Wallabag\Tests\Controller\Api;
 
 class SearchRestControllerTest extends WallabagApiTestCase
 {
diff --git a/tests/Controller/Api/TagRestControllerTest.php b/tests/Controller/Api/TagRestControllerTest.php
index d265829ea..46ccd182d 100644
--- a/tests/Controller/Api/TagRestControllerTest.php
+++ b/tests/Controller/Api/TagRestControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Api;
+namespace Wallabag\Tests\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Wallabag\Entity\Entry;
diff --git a/tests/Controller/Api/TaggingRuleRestControllerTest.php b/tests/Controller/Api/TaggingRuleRestControllerTest.php
index 7c7b4e8f1..a9a0ac9fc 100644
--- a/tests/Controller/Api/TaggingRuleRestControllerTest.php
+++ b/tests/Controller/Api/TaggingRuleRestControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Api;
+namespace Wallabag\Tests\Controller\Api;
 
 class TaggingRuleRestControllerTest extends WallabagApiTestCase
 {
diff --git a/tests/Controller/Api/UserRestControllerTest.php b/tests/Controller/Api/UserRestControllerTest.php
index 23d8393c6..359bbc1ad 100644
--- a/tests/Controller/Api/UserRestControllerTest.php
+++ b/tests/Controller/Api/UserRestControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Api;
+namespace Wallabag\Tests\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 
diff --git a/tests/Controller/Api/WallabagApiTestCase.php b/tests/Controller/Api/WallabagApiTestCase.php
index 603b0ca86..648d51e78 100644
--- a/tests/Controller/Api/WallabagApiTestCase.php
+++ b/tests/Controller/Api/WallabagApiTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Api;
+namespace Wallabag\Tests\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Model\UserManager;
diff --git a/tests/Controller/Api/WallabagRestControllerTest.php b/tests/Controller/Api/WallabagRestControllerTest.php
index 2a36d46cc..11370ba20 100644
--- a/tests/Controller/Api/WallabagRestControllerTest.php
+++ b/tests/Controller/Api/WallabagRestControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Api;
+namespace Wallabag\Tests\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 
diff --git a/tests/Controller/ConfigControllerTest.php b/tests/Controller/ConfigControllerTest.php
index 49b9b3775..828be2184 100644
--- a/tests/Controller/ConfigControllerTest.php
+++ b/tests/Controller/ConfigControllerTest.php
@@ -1,13 +1,12 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Annotation;
 use Wallabag\Entity\Config as ConfigEntity;
 use Wallabag\Entity\Entry;
@@ -15,6 +14,7 @@ use Wallabag\Entity\IgnoreOriginUserRule;
 use Wallabag\Entity\Tag;
 use Wallabag\Entity\TaggingRule;
 use Wallabag\Entity\User;
+use Wallabag\Tests\WallabagTestCase;
 
 class ConfigControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/EntryControllerTest.php b/tests/Controller/EntryControllerTest.php
index 05eca66e0..72d16851e 100644
--- a/tests/Controller/EntryControllerTest.php
+++ b/tests/Controller/EntryControllerTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Annotation;
 use Wallabag\Entity\Config as ConfigEntity;
 use Wallabag\Entity\Entry;
@@ -14,6 +13,7 @@ use Wallabag\Entity\Tag;
 use Wallabag\Entity\User;
 use Wallabag\Helper\ContentProxy;
 use Wallabag\Helper\CryptoProxy;
+use Wallabag\Tests\WallabagTestCase;
 
 class EntryControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/ExportControllerTest.php b/tests/Controller/ExportControllerTest.php
index 40adc896d..b6d07908f 100644
--- a/tests/Controller/ExportControllerTest.php
+++ b/tests/Controller/ExportControllerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
 use Wallabag\Repository\UserRepository;
+use Wallabag\Tests\WallabagTestCase;
 
 class ExportControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/FeedControllerTest.php b/tests/Controller/FeedControllerTest.php
index a2affdb67..acb654b2c 100644
--- a/tests/Controller/FeedControllerTest.php
+++ b/tests/Controller/FeedControllerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
 use Wallabag\Entity\User;
+use Wallabag\Tests\WallabagTestCase;
 
 class FeedControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/IgnoreOriginInstanceRuleControllerTest.php b/tests/Controller/IgnoreOriginInstanceRuleControllerTest.php
index dd1305bc7..3022b43b3 100644
--- a/tests/Controller/IgnoreOriginInstanceRuleControllerTest.php
+++ b/tests/Controller/IgnoreOriginInstanceRuleControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 class IgnoreOriginInstanceRuleControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/ChromeControllerTest.php b/tests/Controller/Import/ChromeControllerTest.php
index 3d9377072..1734a6bb0 100644
--- a/tests/Controller/Import/ChromeControllerTest.php
+++ b/tests/Controller/Import/ChromeControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class ChromeControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/DeliciousControllerTest.php b/tests/Controller/Import/DeliciousControllerTest.php
index 010381ce1..19b4d4975 100644
--- a/tests/Controller/Import/DeliciousControllerTest.php
+++ b/tests/Controller/Import/DeliciousControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class DeliciousControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/ElcuratorControllerTest.php b/tests/Controller/Import/ElcuratorControllerTest.php
index 6e4c4c126..a188a0646 100644
--- a/tests/Controller/Import/ElcuratorControllerTest.php
+++ b/tests/Controller/Import/ElcuratorControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class ElcuratorControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/FirefoxControllerTest.php b/tests/Controller/Import/FirefoxControllerTest.php
index c285018d7..4ccbb3063 100644
--- a/tests/Controller/Import/FirefoxControllerTest.php
+++ b/tests/Controller/Import/FirefoxControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class FirefoxControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/ImportControllerTest.php b/tests/Controller/Import/ImportControllerTest.php
index 14adf8318..5304336d7 100644
--- a/tests/Controller/Import/ImportControllerTest.php
+++ b/tests/Controller/Import/ImportControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 class ImportControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/InstapaperControllerTest.php b/tests/Controller/Import/InstapaperControllerTest.php
index ba58a52cc..020f6c94d 100644
--- a/tests/Controller/Import/InstapaperControllerTest.php
+++ b/tests/Controller/Import/InstapaperControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class InstapaperControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/OmnivoreControllerTest.php b/tests/Controller/Import/OmnivoreControllerTest.php
index 1832bc01e..ba0c713e0 100644
--- a/tests/Controller/Import/OmnivoreControllerTest.php
+++ b/tests/Controller/Import/OmnivoreControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class OmnivoreControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/PinboardControllerTest.php b/tests/Controller/Import/PinboardControllerTest.php
index 9d4e5ec53..027898e7b 100644
--- a/tests/Controller/Import/PinboardControllerTest.php
+++ b/tests/Controller/Import/PinboardControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class PinboardControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/PocketControllerTest.php b/tests/Controller/Import/PocketControllerTest.php
index 4216a7cc1..3dda7448f 100644
--- a/tests/Controller/Import/PocketControllerTest.php
+++ b/tests/Controller/Import/PocketControllerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Import\PocketImport;
+use Wallabag\Tests\WallabagTestCase;
 
 class PocketControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/PocketCsvControllerTest.php b/tests/Controller/Import/PocketCsvControllerTest.php
index 276a60226..daf10b32a 100644
--- a/tests/Controller/Import/PocketCsvControllerTest.php
+++ b/tests/Controller/Import/PocketCsvControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class PocketCsvControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/PocketHtmlControllerTest.php b/tests/Controller/Import/PocketHtmlControllerTest.php
index ed5e86d96..78b390c11 100644
--- a/tests/Controller/Import/PocketHtmlControllerTest.php
+++ b/tests/Controller/Import/PocketHtmlControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class PocketHtmlControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/ReadabilityControllerTest.php b/tests/Controller/Import/ReadabilityControllerTest.php
index 5930cbbbd..a6f2a56da 100644
--- a/tests/Controller/Import/ReadabilityControllerTest.php
+++ b/tests/Controller/Import/ReadabilityControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class ReadabilityControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/ShaarliControllerTest.php b/tests/Controller/Import/ShaarliControllerTest.php
index 2be30f9f8..4a6930454 100644
--- a/tests/Controller/Import/ShaarliControllerTest.php
+++ b/tests/Controller/Import/ShaarliControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class ShaarliControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/WallabagV1ControllerTest.php b/tests/Controller/Import/WallabagV1ControllerTest.php
index a6e394b28..f287570f6 100644
--- a/tests/Controller/Import/WallabagV1ControllerTest.php
+++ b/tests/Controller/Import/WallabagV1ControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class WallabagV1ControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/Import/WallabagV2ControllerTest.php b/tests/Controller/Import/WallabagV2ControllerTest.php
index d3f032601..8b8ca71fc 100644
--- a/tests/Controller/Import/WallabagV2ControllerTest.php
+++ b/tests/Controller/Import/WallabagV2ControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Wallabag\Controller\Import;
+namespace Wallabag\Tests\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class WallabagV2ControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/SecurityControllerTest.php b/tests/Controller/SecurityControllerTest.php
index 110b3ab7f..494e68a4f 100644
--- a/tests/Controller/SecurityControllerTest.php
+++ b/tests/Controller/SecurityControllerTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\User;
+use Wallabag\Tests\WallabagTestCase;
 
 class SecurityControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/SettingsControllerTest.php b/tests/Controller/SettingsControllerTest.php
index 480d1b5ea..d7602d1c2 100644
--- a/tests/Controller/SettingsControllerTest.php
+++ b/tests/Controller/SettingsControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 /**
  * The controller `SettingsController` does not exist.
diff --git a/tests/Controller/SiteCredentialControllerTest.php b/tests/Controller/SiteCredentialControllerTest.php
index c773f5d0a..a4a9d3832 100644
--- a/tests/Controller/SiteCredentialControllerTest.php
+++ b/tests/Controller/SiteCredentialControllerTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\SiteCredential;
+use Wallabag\Tests\WallabagTestCase;
 
 class SiteCredentialControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/StaticControllerTest.php b/tests/Controller/StaticControllerTest.php
index 8fd9515e8..374a2788f 100644
--- a/tests/Controller/StaticControllerTest.php
+++ b/tests/Controller/StaticControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 class StaticControllerTest extends WallabagTestCase
 {
diff --git a/tests/Controller/TagControllerTest.php b/tests/Controller/TagControllerTest.php
index 12db58248..cde5b9097 100644
--- a/tests/Controller/TagControllerTest.php
+++ b/tests/Controller/TagControllerTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
 use Wallabag\Entity\Tag;
 use Wallabag\Entity\User;
+use Wallabag\Tests\WallabagTestCase;
 
 /**
  * @group Tag
diff --git a/tests/Controller/UserControllerTest.php b/tests/Controller/UserControllerTest.php
index 481886e08..6573ba3cf 100644
--- a/tests/Controller/UserControllerTest.php
+++ b/tests/Controller/UserControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\Controller;
+namespace Wallabag\Tests\Controller;
 
-use Tests\Wallabag\WallabagTestCase;
+use Wallabag\Tests\WallabagTestCase;
 
 class UserControllerTest extends WallabagTestCase
 {
diff --git a/tests/Entity/EntryTest.php b/tests/Entity/EntryTest.php
index c7c290480..f46b97dbc 100644
--- a/tests/Entity/EntryTest.php
+++ b/tests/Entity/EntryTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Wallabag\Entity;
+namespace Wallabag\Tests\Entity;
 
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\Entry;
+use Wallabag\Tests\WallabagTestCase;
 
 class EntryTest extends WallabagTestCase
 {
diff --git a/tests/Event/Listener/AuthenticationFailureListenerTest.php b/tests/Event/Listener/AuthenticationFailureListenerTest.php
index 4ae4d9002..716cd20d6 100644
--- a/tests/Event/Listener/AuthenticationFailureListenerTest.php
+++ b/tests/Event/Listener/AuthenticationFailureListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Event\Listener;
+namespace Wallabag\Tests\Event\Listener;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
diff --git a/tests/Event/Listener/CreateConfigListenerTest.php b/tests/Event/Listener/CreateConfigListenerTest.php
index 23410738f..2102f8815 100644
--- a/tests/Event/Listener/CreateConfigListenerTest.php
+++ b/tests/Event/Listener/CreateConfigListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Event\Listener;
+namespace Wallabag\Tests\Event\Listener;
 
 use Doctrine\ORM\EntityManager;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
diff --git a/tests/Event/Listener/LocaleListenerTest.php b/tests/Event/Listener/LocaleListenerTest.php
index eb31ea245..da7cb2169 100644
--- a/tests/Event/Listener/LocaleListenerTest.php
+++ b/tests/Event/Listener/LocaleListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Event\Listener;
+namespace Wallabag\Tests\Event\Listener;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
diff --git a/tests/Event/Listener/UserLocaleListenerTest.php b/tests/Event/Listener/UserLocaleListenerTest.php
index 6ff8432d1..a8c469969 100644
--- a/tests/Event/Listener/UserLocaleListenerTest.php
+++ b/tests/Event/Listener/UserLocaleListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Event\Listener;
+namespace Wallabag\Tests\Event\Listener;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/tests/Event/Subscriber/TablePrefixSubscriberTest.php b/tests/Event/Subscriber/TablePrefixSubscriberTest.php
index 2872fb23f..3c44bfac2 100644
--- a/tests/Event/Subscriber/TablePrefixSubscriberTest.php
+++ b/tests/Event/Subscriber/TablePrefixSubscriberTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Event\Subscriber;
+namespace Wallabag\Tests\Event\Subscriber;
 
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
diff --git a/tests/Form/DataTransformer/StringToListTransformerTest.php b/tests/Form/DataTransformer/StringToListTransformerTest.php
index 1a09c3c1e..3b52c3aed 100644
--- a/tests/Form/DataTransformer/StringToListTransformerTest.php
+++ b/tests/Form/DataTransformer/StringToListTransformerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Form\DataTransformer;
+namespace Wallabag\Tests\Form\DataTransformer;
 
 use PHPUnit\Framework\TestCase;
 use Wallabag\Form\DataTransformer\StringToListTransformer;
diff --git a/tests/Helper/ContentProxyTest.php b/tests/Helper/ContentProxyTest.php
index 37cc72fc4..7ae71e6f8 100644
--- a/tests/Helper/ContentProxyTest.php
+++ b/tests/Helper/ContentProxyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Helper;
+namespace Wallabag\Tests\Helper;
 
 use Graby\Graby;
 use Monolog\Handler\TestHandler;
diff --git a/tests/Helper/CryptoProxyTest.php b/tests/Helper/CryptoProxyTest.php
index 8863705a9..068027726 100644
--- a/tests/Helper/CryptoProxyTest.php
+++ b/tests/Helper/CryptoProxyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Helper;
+namespace Wallabag\Tests\Helper;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
diff --git a/tests/Helper/DownloadImagesTest.php b/tests/Helper/DownloadImagesTest.php
index facef6693..b0f8429e5 100644
--- a/tests/Helper/DownloadImagesTest.php
+++ b/tests/Helper/DownloadImagesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Helper;
+namespace Wallabag\Tests\Helper;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
diff --git a/tests/Helper/RedirectTest.php b/tests/Helper/RedirectTest.php
index 06e47cf06..bdaccb105 100644
--- a/tests/Helper/RedirectTest.php
+++ b/tests/Helper/RedirectTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Helper;
+namespace Wallabag\Tests\Helper;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Helper/RuleBasedIgnoreOriginProcessorTest.php b/tests/Helper/RuleBasedIgnoreOriginProcessorTest.php
index 10aae734f..01fdcca9a 100644
--- a/tests/Helper/RuleBasedIgnoreOriginProcessorTest.php
+++ b/tests/Helper/RuleBasedIgnoreOriginProcessorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Helper;
+namespace Wallabag\Tests\Helper;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
diff --git a/tests/Helper/RuleBasedTaggerTest.php b/tests/Helper/RuleBasedTaggerTest.php
index 509fb5bf7..80ef0d405 100644
--- a/tests/Helper/RuleBasedTaggerTest.php
+++ b/tests/Helper/RuleBasedTaggerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Helper;
+namespace Wallabag\Tests\Helper;
 
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
diff --git a/tests/Helper/TagsAssignerTest.php b/tests/Helper/TagsAssignerTest.php
index 88ad8d26c..357aa7b27 100644
--- a/tests/Helper/TagsAssignerTest.php
+++ b/tests/Helper/TagsAssignerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Helper;
+namespace Wallabag\Tests\Helper;
 
 use PHPUnit\Framework\TestCase;
 use Wallabag\Entity\Entry;
diff --git a/tests/HttpClient/AuthenticatorTest.php b/tests/HttpClient/AuthenticatorTest.php
index e47dc1c68..b5942fc35 100644
--- a/tests/HttpClient/AuthenticatorTest.php
+++ b/tests/HttpClient/AuthenticatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\HttpClient;
+namespace Wallabag\Tests\HttpClient;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
diff --git a/tests/Import/ChromeImportTest.php b/tests/Import/ChromeImportTest.php
index 92169ca96..3e39f9d59 100644
--- a/tests/Import/ChromeImportTest.php
+++ b/tests/Import/ChromeImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
diff --git a/tests/Import/FirefoxImportTest.php b/tests/Import/FirefoxImportTest.php
index 9a4592b31..b86ed2cf4 100644
--- a/tests/Import/FirefoxImportTest.php
+++ b/tests/Import/FirefoxImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
diff --git a/tests/Import/ImportChainTest.php b/tests/Import/ImportChainTest.php
index dae2bd18a..eaaee8796 100644
--- a/tests/Import/ImportChainTest.php
+++ b/tests/Import/ImportChainTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use PHPUnit\Framework\TestCase;
 use Wallabag\Import\ImportChain;
diff --git a/tests/Import/ImportCompilerPassTest.php b/tests/Import/ImportCompilerPassTest.php
index 111341df6..19c6eac2b 100644
--- a/tests/Import/ImportCompilerPassTest.php
+++ b/tests/Import/ImportCompilerPassTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/tests/Import/InstapaperImportTest.php b/tests/Import/InstapaperImportTest.php
index f51b80305..bde8d8a17 100644
--- a/tests/Import/InstapaperImportTest.php
+++ b/tests/Import/InstapaperImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\UnitOfWork;
diff --git a/tests/Import/PocketCsvImportTest.php b/tests/Import/PocketCsvImportTest.php
index eb2a96324..5d37c0f54 100644
--- a/tests/Import/PocketCsvImportTest.php
+++ b/tests/Import/PocketCsvImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
diff --git a/tests/Import/PocketHtmlImportTest.php b/tests/Import/PocketHtmlImportTest.php
index 47a0da9f7..9bd281a9e 100644
--- a/tests/Import/PocketHtmlImportTest.php
+++ b/tests/Import/PocketHtmlImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
diff --git a/tests/Import/PocketImportTest.php b/tests/Import/PocketImportTest.php
index 9654bbc35..9f8c61a75 100644
--- a/tests/Import/PocketImportTest.php
+++ b/tests/Import/PocketImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\UnitOfWork;
diff --git a/tests/Import/ReadabilityImportTest.php b/tests/Import/ReadabilityImportTest.php
index 1ef33a173..461d4a70b 100644
--- a/tests/Import/ReadabilityImportTest.php
+++ b/tests/Import/ReadabilityImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
diff --git a/tests/Import/ShaarliImportTest.php b/tests/Import/ShaarliImportTest.php
index 10dfb0fd8..59b761be9 100644
--- a/tests/Import/ShaarliImportTest.php
+++ b/tests/Import/ShaarliImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use M6Web\Component\RedisMock\RedisMockFactory;
diff --git a/tests/Import/WallabagV1ImportTest.php b/tests/Import/WallabagV1ImportTest.php
index dc2729e19..92a5e50e8 100644
--- a/tests/Import/WallabagV1ImportTest.php
+++ b/tests/Import/WallabagV1ImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\UnitOfWork;
diff --git a/tests/Import/WallabagV2ImportTest.php b/tests/Import/WallabagV2ImportTest.php
index 41c4a1ad5..55b619818 100644
--- a/tests/Import/WallabagV2ImportTest.php
+++ b/tests/Import/WallabagV2ImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Import;
+namespace Wallabag\Tests\Import;
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\UnitOfWork;
diff --git a/tests/Mailer/AuthCodeMailerTest.php b/tests/Mailer/AuthCodeMailerTest.php
index 4b6baaea0..f260c5ea2 100644
--- a/tests/Mailer/AuthCodeMailerTest.php
+++ b/tests/Mailer/AuthCodeMailerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Mailer;
+namespace Wallabag\Tests\Mailer;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\MailerInterface;
diff --git a/tests/ParamConverter/UsernameFeedTokenConverterTest.php b/tests/ParamConverter/UsernameFeedTokenConverterTest.php
index f3d0da81e..6c2fe5d6d 100644
--- a/tests/ParamConverter/UsernameFeedTokenConverterTest.php
+++ b/tests/ParamConverter/UsernameFeedTokenConverterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\ParamConverter;
+namespace Wallabag\Tests\ParamConverter;
 
 use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\Persistence\Mapping\ClassMetadata;
diff --git a/tests/Security/Voter/AdminVoterTest.php b/tests/Security/Voter/AdminVoterTest.php
index 605e5a3b6..a17d619f0 100644
--- a/tests/Security/Voter/AdminVoterTest.php
+++ b/tests/Security/Voter/AdminVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/Security/Voter/AnnotationVoterTest.php b/tests/Security/Voter/AnnotationVoterTest.php
index 002e72e6e..6f4f1cd02 100644
--- a/tests/Security/Voter/AnnotationVoterTest.php
+++ b/tests/Security/Voter/AnnotationVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/Security/Voter/EntryVoterTest.php b/tests/Security/Voter/EntryVoterTest.php
index 9cfb84645..7d30652a7 100644
--- a/tests/Security/Voter/EntryVoterTest.php
+++ b/tests/Security/Voter/EntryVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/Security/Voter/IgnoreOriginInstanceRuleVoterTest.php b/tests/Security/Voter/IgnoreOriginInstanceRuleVoterTest.php
index 4a11f9fc1..4b725e7c3 100644
--- a/tests/Security/Voter/IgnoreOriginInstanceRuleVoterTest.php
+++ b/tests/Security/Voter/IgnoreOriginInstanceRuleVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/Security/Voter/IgnoreOriginUserRuleVoterTest.php b/tests/Security/Voter/IgnoreOriginUserRuleVoterTest.php
index fd2ddb3f7..5695e581d 100644
--- a/tests/Security/Voter/IgnoreOriginUserRuleVoterTest.php
+++ b/tests/Security/Voter/IgnoreOriginUserRuleVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/Security/Voter/MainVoterTest.php b/tests/Security/Voter/MainVoterTest.php
index 45870574b..25c48d0f2 100644
--- a/tests/Security/Voter/MainVoterTest.php
+++ b/tests/Security/Voter/MainVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/Security/Voter/SiteCredentialVoterTest.php b/tests/Security/Voter/SiteCredentialVoterTest.php
index a35f2d102..de83e0450 100644
--- a/tests/Security/Voter/SiteCredentialVoterTest.php
+++ b/tests/Security/Voter/SiteCredentialVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/Security/Voter/TagVoterTest.php b/tests/Security/Voter/TagVoterTest.php
index a59cde562..057388a95 100644
--- a/tests/Security/Voter/TagVoterTest.php
+++ b/tests/Security/Voter/TagVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/Security/Voter/TaggingRuleVoterTest.php b/tests/Security/Voter/TaggingRuleVoterTest.php
index 9a00040ef..dd3a8dfbc 100644
--- a/tests/Security/Voter/TaggingRuleVoterTest.php
+++ b/tests/Security/Voter/TaggingRuleVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/Security/Voter/UserVoterTest.php b/tests/Security/Voter/UserVoterTest.php
index d76f61a22..ce518d0f0 100644
--- a/tests/Security/Voter/UserVoterTest.php
+++ b/tests/Security/Voter/UserVoterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Security\Voter;
+namespace Wallabag\Tests\Security\Voter;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
diff --git a/tests/SiteConfig/ArraySiteConfigBuilderTest.php b/tests/SiteConfig/ArraySiteConfigBuilderTest.php
index ab3ede565..eab32a27f 100644
--- a/tests/SiteConfig/ArraySiteConfigBuilderTest.php
+++ b/tests/SiteConfig/ArraySiteConfigBuilderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\SiteConfig;
+namespace Wallabag\Tests\SiteConfig;
 
 use PHPUnit\Framework\TestCase;
 use Wallabag\SiteConfig\ArraySiteConfigBuilder;
diff --git a/tests/SiteConfig/GrabySiteConfigBuilderTest.php b/tests/SiteConfig/GrabySiteConfigBuilderTest.php
index c93ecde9d..3031beb64 100644
--- a/tests/SiteConfig/GrabySiteConfigBuilderTest.php
+++ b/tests/SiteConfig/GrabySiteConfigBuilderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\SiteConfig;
+namespace Wallabag\Tests\SiteConfig;
 
 use Graby\SiteConfig\ConfigBuilder;
 use Graby\SiteConfig\SiteConfig as GrabySiteConfig;
@@ -8,10 +8,10 @@ use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Tests\Wallabag\WallabagTestCase;
 use Wallabag\Entity\User;
 use Wallabag\Repository\SiteCredentialRepository;
 use Wallabag\SiteConfig\GrabySiteConfigBuilder;
+use Wallabag\Tests\WallabagTestCase;
 
 class GrabySiteConfigBuilderTest extends WallabagTestCase
 {
diff --git a/tests/SiteConfig/LoginFormAuthenticatorTest.php b/tests/SiteConfig/LoginFormAuthenticatorTest.php
index b4295cfc8..2134e5424 100644
--- a/tests/SiteConfig/LoginFormAuthenticatorTest.php
+++ b/tests/SiteConfig/LoginFormAuthenticatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\SiteConfig;
+namespace Wallabag\Tests\SiteConfig;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\BrowserKit\HttpBrowser;
diff --git a/tests/SiteConfig/SiteConfigTest.php b/tests/SiteConfig/SiteConfigTest.php
index af4496ba7..ab32b236e 100644
--- a/tests/SiteConfig/SiteConfigTest.php
+++ b/tests/SiteConfig/SiteConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\SiteConfig;
+namespace Wallabag\Tests\SiteConfig;
 
 use PHPUnit\Framework\TestCase;
 use Wallabag\SiteConfig\SiteConfig;
diff --git a/tests/Tools/UtilsTest.php b/tests/Tools/UtilsTest.php
index e80ee2bd4..a89bd17a0 100644
--- a/tests/Tools/UtilsTest.php
+++ b/tests/Tools/UtilsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Tools;
+namespace Wallabag\Tests\Tools;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
diff --git a/tests/Twig/WallabagExtensionTest.php b/tests/Twig/WallabagExtensionTest.php
index 8d31761cb..41bd7944b 100644
--- a/tests/Twig/WallabagExtensionTest.php
+++ b/tests/Twig/WallabagExtensionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Twig;
+namespace Wallabag\Tests\Twig;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
diff --git a/tests/WallabagTestCase.php b/tests/WallabagTestCase.php
index 6460dd426..a2484e545 100644
--- a/tests/WallabagTestCase.php
+++ b/tests/WallabagTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag;
+namespace Wallabag\Tests;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Predis\Client;