diff --git a/composer.json b/composer.json
index 60fa1190..866cec61 100644
--- a/composer.json
+++ b/composer.json
@@ -35,15 +35,14 @@
     "phpunit/phpunit": "^6",
     "phpunit/dbunit": "^3",
     "pdepend/pdepend" : "@stable",
-    "phpmd/phpmd" : "@stable",
-    "squizlabs/php_codesniffer": "3.*"
+    "phpmd/phpmd" : "@stable"
   },
   "autoload": {
     "psr-4": {
       "SP\\": "lib/SP/",
       "SP\\Modules\\Web\\": "app/modules/web/",
       "SP\\Modules\\Api\\": "app/modules/api/",
-      "SP\\Tests\\": "tests"
+      "SP\\Test\\": "test"
     }
   },
   "config": {
diff --git a/tests/ConfigTest.php b/test/Config/ConfigTest.php
similarity index 97%
rename from tests/ConfigTest.php
rename to test/Config/ConfigTest.php
index 0466977c..9ae9ba0c 100644
--- a/tests/ConfigTest.php
+++ b/test/Config/ConfigTest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Config;
 
 use DI\Container;
 use DI\DependencyException;
@@ -31,6 +31,7 @@ use PHPUnit\Framework\TestCase;
 use SP\Config\Config;
 use SP\Config\ConfigData;
 use SP\Core\Context\ContextInterface;
+use function SP\Test\setupContext;
 
 /**
  * Class ConfigTest
diff --git a/tests/CryptTest.php b/test/Core/Crypt/CryptTest.php
similarity index 97%
rename from tests/CryptTest.php
rename to test/Core/Crypt/CryptTest.php
index c291b714..a7a859e8 100644
--- a/tests/CryptTest.php
+++ b/test/Core/Crypt/CryptTest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Core\Crypt;
 
 use Defuse\Crypto\Exception\CryptoException;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/VaultTest.php b/test/Core/Crypt/VaultTest.php
similarity index 97%
rename from tests/VaultTest.php
rename to test/Core/Crypt/VaultTest.php
index 1009cf83..73a677de 100644
--- a/tests/VaultTest.php
+++ b/test/Core/Crypt/VaultTest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Core\Crypt;
 
 use PHPUnit\Framework\TestCase;
 use SP\Core\Crypt\Vault;
diff --git a/tests/DatabaseTestCase.php b/test/DatabaseTestCase.php
similarity index 99%
rename from tests/DatabaseTestCase.php
rename to test/DatabaseTestCase.php
index 126098e7..5a06fdc1 100644
--- a/tests/DatabaseTestCase.php
+++ b/test/DatabaseTestCase.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test;
 
 use PHPUnit\DbUnit\Database\DefaultConnection;
 use PHPUnit\DbUnit\DataSet\IDataSet;
diff --git a/tests/Repositories/AccountFileRepositoryTest.php b/test/Repositories/AccountFileRepositoryTest.php
similarity index 99%
rename from tests/Repositories/AccountFileRepositoryTest.php
rename to test/Repositories/AccountFileRepositoryTest.php
index cb3c0075..18688e5e 100644
--- a/tests/Repositories/AccountFileRepositoryTest.php
+++ b/test/Repositories/AccountFileRepositoryTest.php
@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\DataModel\FileData;
 use SP\DataModel\FileExtData;
 use SP\DataModel\ItemSearchData;
 use SP\Repositories\Account\AccountFileRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountFileRepositoryTest
diff --git a/tests/Repositories/AccountHistoryRepositoryTest.php b/test/Repositories/AccountHistoryRepositoryTest.php
similarity index 98%
rename from tests/Repositories/AccountHistoryRepositoryTest.php
rename to test/Repositories/AccountHistoryRepositoryTest.php
index 52fa9ece..901a0e9f 100644
--- a/tests/Repositories/AccountHistoryRepositoryTest.php
+++ b/test/Repositories/AccountHistoryRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\DataModel\AccountHistoryData;
 use SP\DataModel\Dto\AccountHistoryCreateDto;
@@ -30,9 +30,9 @@ use SP\DataModel\ItemSearchData;
 use SP\Repositories\Account\AccountHistoryRepository;
 use SP\Services\Account\AccountPasswordRequest;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountHistoryRepositoryTest
diff --git a/tests/Repositories/AccountRepositoryTest.php b/test/Repositories/AccountRepositoryTest.php
similarity index 99%
rename from tests/Repositories/AccountRepositoryTest.php
rename to test/Repositories/AccountRepositoryTest.php
index f7136e5a..2c45cc4f 100644
--- a/tests/Repositories/AccountRepositoryTest.php
+++ b/test/Repositories/AccountRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Account\AccountRequest;
@@ -37,8 +37,8 @@ use SP\Mvc\Model\QueryCondition;
 use SP\Repositories\Account\AccountRepository;
 use SP\Services\Account\AccountPasswordRequest;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountRepositoryTest
diff --git a/tests/Repositories/AccountToFavoriteRepositoryTest.php b/test/Repositories/AccountToFavoriteRepositoryTest.php
similarity index 96%
rename from tests/Repositories/AccountToFavoriteRepositoryTest.php
rename to test/Repositories/AccountToFavoriteRepositoryTest.php
index 0653bf1b..20c802eb 100644
--- a/tests/Repositories/AccountToFavoriteRepositoryTest.php
+++ b/test/Repositories/AccountToFavoriteRepositoryTest.php
@@ -22,14 +22,14 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Repositories\Account\AccountToFavoriteRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountFavoriteRepositoryTest
diff --git a/tests/Repositories/AccountToTagRepositoryTest.php b/test/Repositories/AccountToTagRepositoryTest.php
similarity index 97%
rename from tests/Repositories/AccountToTagRepositoryTest.php
rename to test/Repositories/AccountToTagRepositoryTest.php
index dc3a8bad..43d6c72b 100644
--- a/tests/Repositories/AccountToTagRepositoryTest.php
+++ b/test/Repositories/AccountToTagRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Account\AccountRequest;
@@ -30,8 +30,8 @@ use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\ItemData;
 use SP\Repositories\Account\AccountToTagRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountToTagRepositoryTest
diff --git a/tests/Repositories/AccountToUserGroupRepositoryTest.php b/test/Repositories/AccountToUserGroupRepositoryTest.php
similarity index 99%
rename from tests/Repositories/AccountToUserGroupRepositoryTest.php
rename to test/Repositories/AccountToUserGroupRepositoryTest.php
index bba50176..57bea8fe 100644
--- a/tests/Repositories/AccountToUserGroupRepositoryTest.php
+++ b/test/Repositories/AccountToUserGroupRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Account\AccountRequest;
@@ -30,8 +30,8 @@ use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\ItemData;
 use SP\Repositories\Account\AccountToUserGroupRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountToUserGroupRepositoryTest
diff --git a/tests/Repositories/AccountToUserRepositoryTest.php b/test/Repositories/AccountToUserRepositoryTest.php
similarity index 98%
rename from tests/Repositories/AccountToUserRepositoryTest.php
rename to test/Repositories/AccountToUserRepositoryTest.php
index ef557520..ebe5e993 100644
--- a/tests/Repositories/AccountToUserRepositoryTest.php
+++ b/test/Repositories/AccountToUserRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Account\AccountRequest;
@@ -30,8 +30,8 @@ use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\ItemData;
 use SP\Repositories\Account\AccountToUserRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountToUserRepositoryTest
diff --git a/tests/Repositories/AuthTokenRepositoryTest.php b/test/Repositories/AuthTokenRepositoryTest.php
similarity index 99%
rename from tests/Repositories/AuthTokenRepositoryTest.php
rename to test/Repositories/AuthTokenRepositoryTest.php
index 9ef6de8a..07e3be8f 100644
--- a/tests/Repositories/AuthTokenRepositoryTest.php
+++ b/test/Repositories/AuthTokenRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use Defuse\Crypto\Exception\CryptoException;
 use DI\DependencyException;
@@ -34,9 +34,9 @@ use SP\DataModel\ItemSearchData;
 use SP\Repositories\AuthToken\AuthTokenRepository;
 use SP\Repositories\DuplicatedItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AuthTokenRepositoryTest
diff --git a/tests/Repositories/CategoryRepositoryTest.php b/test/Repositories/CategoryRepositoryTest.php
similarity index 98%
rename from tests/Repositories/CategoryRepositoryTest.php
rename to test/Repositories/CategoryRepositoryTest.php
index e98713b1..0e387d43 100644
--- a/tests/Repositories/CategoryRepositoryTest.php
+++ b/test/Repositories/CategoryRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
@@ -31,8 +31,8 @@ use SP\DataModel\ItemSearchData;
 use SP\Repositories\Category\CategoryRepository;
 use SP\Repositories\DuplicatedItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CategoryRepositoryTest
diff --git a/tests/Repositories/ClientRepositoryTest.php b/test/Repositories/ClientRepositoryTest.php
similarity index 98%
rename from tests/Repositories/ClientRepositoryTest.php
rename to test/Repositories/ClientRepositoryTest.php
index e8d54f92..ddbb72c7 100644
--- a/tests/Repositories/ClientRepositoryTest.php
+++ b/test/Repositories/ClientRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
@@ -32,8 +32,8 @@ use SP\Mvc\Model\QueryCondition;
 use SP\Repositories\Client\ClientRepository;
 use SP\Repositories\DuplicatedItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class ClientRepositoryTest
diff --git a/tests/Repositories/ConfigRepositoryTest.php b/test/Repositories/ConfigRepositoryTest.php
similarity index 98%
rename from tests/Repositories/ConfigRepositoryTest.php
rename to test/Repositories/ConfigRepositoryTest.php
index a09cfe2b..19be499d 100644
--- a/tests/Repositories/ConfigRepositoryTest.php
+++ b/test/Repositories/ConfigRepositoryTest.php
@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\DataModel\ConfigData;
 use SP\Repositories\Config\ConfigRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class ConfigRepositoryTest
diff --git a/tests/Repositories/CustomFieldDefRepositoryTest.php b/test/Repositories/CustomFieldDefRepositoryTest.php
similarity index 98%
rename from tests/Repositories/CustomFieldDefRepositoryTest.php
rename to test/Repositories/CustomFieldDefRepositoryTest.php
index 4310df3f..817b0b1d 100644
--- a/tests/Repositories/CustomFieldDefRepositoryTest.php
+++ b/test/Repositories/CustomFieldDefRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Exceptions\ConstraintException;
@@ -31,8 +31,8 @@ use SP\DataModel\ItemSearchData;
 use SP\Repositories\CustomField\CustomFieldDefRepository;
 use SP\Repositories\NoSuchItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldDefRepositoryTest
diff --git a/tests/Repositories/CustomFieldRepositoryTest.php b/test/Repositories/CustomFieldRepositoryTest.php
similarity index 96%
rename from tests/Repositories/CustomFieldRepositoryTest.php
rename to test/Repositories/CustomFieldRepositoryTest.php
index 7b7ff357..e5c29ab6 100644
--- a/tests/Repositories/CustomFieldRepositoryTest.php
+++ b/test/Repositories/CustomFieldRepositoryTest.php
@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\CustomFieldData;
 use SP\Repositories\CustomField\CustomFieldRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldRepositoryTest
@@ -109,7 +109,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setDefinitionId(1);
         $data->setId(1);
 
-        $this->assertTrue(self::$repository->checkExists($data));
+        $this->assertFalse(self::$repository->checkExists($data));
 
         $data->setModuleId(ActionsInterface::CATEGORY);
         $data->setDefinitionId(1);
@@ -230,15 +230,15 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $this->assertEquals(1, $data[0]->typeId);
         $this->assertEquals('text', $data[0]->typeName);
         $this->assertEquals('Texto', $data[0]->typeText);
-        $this->assertNotEmpty($data[0]->data);
-        $this->assertNotEmpty($data[0]->key);
+        $this->assertNull($data[0]->data);
+        $this->assertNull($data[0]->key);
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::ACCOUNT, 3);
 
         $this->assertEquals(1, $result->getNumRows());
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::CATEGORY, 1);
-        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(2, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
@@ -257,7 +257,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $this->assertNull($data[0]->key);
 
         $result = self::$repository->getForModuleAndItemId(ActionsInterface::CATEGORY, 2);
-        $this->assertEquals(1, $result->getNumRows());
+        $this->assertEquals(2, $result->getNumRows());
 
         $data = $result->getDataAsArray();
 
@@ -362,7 +362,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setData('cuenta');
         $data->setKey('nan');
 
-        $this->assertEquals(1, self::$repository->update($data));
+        $this->assertEquals(0, self::$repository->update($data));
 
         $data = new CustomFieldData();
         $data->setId(1);
@@ -371,7 +371,7 @@ class CustomFieldRepositoryTest extends DatabaseTestCase
         $data->setData('categoria');
         $data->setKey('nan');
 
-        $this->assertEquals(1, self::$repository->update($data));
+        $this->assertEquals(0, self::$repository->update($data));
 
 
         $data = new CustomFieldData();
diff --git a/tests/Repositories/CustomFieldTypeRepositoryTest.php b/test/Repositories/CustomFieldTypeRepositoryTest.php
similarity index 98%
rename from tests/Repositories/CustomFieldTypeRepositoryTest.php
rename to test/Repositories/CustomFieldTypeRepositoryTest.php
index 6ab6b044..7e478832 100644
--- a/tests/Repositories/CustomFieldTypeRepositoryTest.php
+++ b/test/Repositories/CustomFieldTypeRepositoryTest.php
@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\CustomFieldTypeData;
 use SP\Repositories\CustomField\CustomFieldTypeRepository;
 use SP\Repositories\NoSuchItemException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldTypeRepositoryTest
diff --git a/tests/Repositories/EventlogRepositoryTest.php b/test/Repositories/EventlogRepositoryTest.php
similarity index 97%
rename from tests/Repositories/EventlogRepositoryTest.php
rename to test/Repositories/EventlogRepositoryTest.php
index eb2207d1..031b8ca1 100644
--- a/tests/Repositories/EventlogRepositoryTest.php
+++ b/test/Repositories/EventlogRepositoryTest.php
@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\EventlogData;
 use SP\DataModel\ItemSearchData;
 use SP\Repositories\EventLog\EventlogRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class EventlogRepositoryTest
diff --git a/tests/Repositories/NotificationRepositoryTest.php b/test/Repositories/NotificationRepositoryTest.php
similarity index 99%
rename from tests/Repositories/NotificationRepositoryTest.php
rename to test/Repositories/NotificationRepositoryTest.php
index 04a172f0..d50fe09d 100644
--- a/tests/Repositories/NotificationRepositoryTest.php
+++ b/test/Repositories/NotificationRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -32,8 +32,8 @@ use SP\DataModel\ItemSearchData;
 use SP\DataModel\NotificationData;
 use SP\Repositories\Notification\NotificationRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class NotificationRepositoryTest
diff --git a/tests/Repositories/PluginRepositoryTest.php b/test/Repositories/PluginRepositoryTest.php
similarity index 99%
rename from tests/Repositories/PluginRepositoryTest.php
rename to test/Repositories/PluginRepositoryTest.php
index 84333bf2..d3dbff71 100644
--- a/tests/Repositories/PluginRepositoryTest.php
+++ b/test/Repositories/PluginRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -31,8 +31,8 @@ use SP\DataModel\ItemSearchData;
 use SP\DataModel\PluginData;
 use SP\Repositories\Plugin\PluginRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class PluginRepositoryTest
diff --git a/tests/Repositories/PublicLinkRepositoryTest.php b/test/Repositories/PublicLinkRepositoryTest.php
similarity index 99%
rename from tests/Repositories/PublicLinkRepositoryTest.php
rename to test/Repositories/PublicLinkRepositoryTest.php
index ddb8b7a4..cbf4d9cf 100644
--- a/tests/Repositories/PublicLinkRepositoryTest.php
+++ b/test/Repositories/PublicLinkRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -32,9 +32,9 @@ use SP\DataModel\PublicLinkListData;
 use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\PublicLink\PublicLinkRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class PublicLinkRepositoryTest
diff --git a/tests/Repositories/TagRepositoryTest.php b/test/Repositories/TagRepositoryTest.php
similarity index 98%
rename from tests/Repositories/TagRepositoryTest.php
rename to test/Repositories/TagRepositoryTest.php
index 5f7c6aad..689d7f9e 100644
--- a/tests/Repositories/TagRepositoryTest.php
+++ b/test/Repositories/TagRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use SP\Core\Exceptions\QueryException;
 use SP\DataModel\ItemSearchData;
@@ -30,8 +30,8 @@ use SP\DataModel\TagData;
 use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\Tag\TagRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class TagRepositoryTest
diff --git a/tests/Repositories/TrackRepositoryTest.php b/test/Repositories/TrackRepositoryTest.php
similarity index 98%
rename from tests/Repositories/TrackRepositoryTest.php
rename to test/Repositories/TrackRepositoryTest.php
index 2f19e6f7..bf39f838 100644
--- a/tests/Repositories/TrackRepositoryTest.php
+++ b/test/Repositories/TrackRepositoryTest.php
@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\DataModel\TrackData;
 use SP\Repositories\Track\TrackRepository;
 use SP\Repositories\Track\TrackRequest;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class TrackRepositoryTest
diff --git a/tests/Repositories/UserGroupRepositoryTest.php b/test/Repositories/UserGroupRepositoryTest.php
similarity index 98%
rename from tests/Repositories/UserGroupRepositoryTest.php
rename to test/Repositories/UserGroupRepositoryTest.php
index 01410209..4285bb01 100644
--- a/tests/Repositories/UserGroupRepositoryTest.php
+++ b/test/Repositories/UserGroupRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -32,8 +32,8 @@ use SP\DataModel\UserGroupData;
 use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\UserGroup\UserGroupRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class UserGroupRepositoryTest
diff --git a/tests/Repositories/UserPassRecoverRepositoryTest.php b/test/Repositories/UserPassRecoverRepositoryTest.php
similarity index 97%
rename from tests/Repositories/UserPassRecoverRepositoryTest.php
rename to test/Repositories/UserPassRecoverRepositoryTest.php
index ed26813c..db1b8ff8 100644
--- a/tests/Repositories/UserPassRecoverRepositoryTest.php
+++ b/test/Repositories/UserPassRecoverRepositoryTest.php
@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Repositories\User\UserPassRecoverRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class UserPassRecoverRepositoryTest
diff --git a/tests/Repositories/UserProfileRepositoryTest.php b/test/Repositories/UserProfileRepositoryTest.php
similarity index 98%
rename from tests/Repositories/UserProfileRepositoryTest.php
rename to test/Repositories/UserProfileRepositoryTest.php
index 02bcf820..b77c297a 100644
--- a/tests/Repositories/UserProfileRepositoryTest.php
+++ b/test/Repositories/UserProfileRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Exceptions\ConstraintException;
@@ -33,8 +33,8 @@ use SP\DataModel\UserProfileData;
 use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\UserProfile\UserProfileRepository;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class UserProfileRepositoryTest
diff --git a/tests/Repositories/UserRepositoryTest.php b/test/Repositories/UserRepositoryTest.php
similarity index 99%
rename from tests/Repositories/UserRepositoryTest.php
rename to test/Repositories/UserRepositoryTest.php
index 0691617d..0bcae010 100644
--- a/tests/Repositories/UserRepositoryTest.php
+++ b/test/Repositories/UserRepositoryTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Repositories;
+namespace SP\Test\Repositories;
 
 use DI\DependencyException;
 use SP\Core\Crypt\Crypt;
@@ -37,8 +37,8 @@ use SP\Repositories\NoSuchItemException;
 use SP\Repositories\User\UserRepository;
 use SP\Services\User\UpdatePassRequest;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class UserRepositoryTest
diff --git a/tests/Services/Account/AccountAclServiceTest.php b/test/Services/Account/AccountAclServiceTest.php
similarity index 99%
rename from tests/Services/Account/AccountAclServiceTest.php
rename to test/Services/Account/AccountAclServiceTest.php
index 60d097c4..881e1e9e 100644
--- a/tests/Services/Account/AccountAclServiceTest.php
+++ b/test/Services/Account/AccountAclServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Account\AccountAcl;
 use SP\Core\Acl\Acl;
@@ -34,8 +34,8 @@ use SP\Services\Account\AccountAclService;
 use SP\Services\Account\AccountService;
 use SP\Services\User\UserLoginResponse;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountAclServiceTest
diff --git a/tests/Services/Account/AccountCryptServiceTest.php b/test/Services/Account/AccountCryptServiceTest.php
similarity index 98%
rename from tests/Services/Account/AccountCryptServiceTest.php
rename to test/Services/Account/AccountCryptServiceTest.php
index ff505c9a..28db52a2 100644
--- a/tests/Services/Account/AccountCryptServiceTest.php
+++ b/test/Services/Account/AccountCryptServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use Defuse\Crypto\Exception\CryptoException;
 use SP\Core\Crypt\Crypt;
@@ -31,8 +31,8 @@ use SP\Services\Account\AccountService;
 use SP\Services\Crypt\UpdateMasterPassRequest;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountCryptServiceTest
diff --git a/tests/Services/Account/AccountFileServiceTest.php b/test/Services/Account/AccountFileServiceTest.php
similarity index 99%
rename from tests/Services/Account/AccountFileServiceTest.php
rename to test/Services/Account/AccountFileServiceTest.php
index 4ecdd208..e2884006 100644
--- a/tests/Services/Account/AccountFileServiceTest.php
+++ b/test/Services/Account/AccountFileServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Core\Exceptions\InvalidImageException;
 use SP\DataModel\FileData;
@@ -32,8 +32,8 @@ use SP\Repositories\NoSuchItemException;
 use SP\Services\Account\AccountFileService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountFileServiceTest
diff --git a/tests/Services/Account/AccountHistoryServiceTest.php b/test/Services/Account/AccountHistoryServiceTest.php
similarity index 98%
rename from tests/Services/Account/AccountHistoryServiceTest.php
rename to test/Services/Account/AccountHistoryServiceTest.php
index 4a412496..56edb386 100644
--- a/tests/Services/Account/AccountHistoryServiceTest.php
+++ b/test/Services/Account/AccountHistoryServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\DataModel\AccountHistoryData;
 use SP\DataModel\Dto\AccountHistoryCreateDto;
@@ -32,9 +32,9 @@ use SP\Services\Account\AccountHistoryService;
 use SP\Services\Account\AccountPasswordRequest;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountHistoryServiceTest
diff --git a/tests/Services/Account/AccountSearchServiceTest.php b/test/Services/Account/AccountSearchServiceTest.php
similarity index 99%
rename from tests/Services/Account/AccountSearchServiceTest.php
rename to test/Services/Account/AccountSearchServiceTest.php
index c6159fb6..7d9ecca3 100644
--- a/tests/Services/Account/AccountSearchServiceTest.php
+++ b/test/Services/Account/AccountSearchServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Account\AccountSearchFilter;
 use SP\Account\AccountSearchItem;
@@ -33,8 +33,8 @@ use SP\Services\Account\AccountSearchService;
 use SP\Services\User\UserLoginResponse;
 use SP\Storage\Database\DatabaseConnectionData;
 use SP\Storage\Database\QueryResult;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountSearchServiceTest
diff --git a/tests/Services/Account/AccountServiceTest.php b/test/Services/Account/AccountServiceTest.php
similarity index 99%
rename from tests/Services/Account/AccountServiceTest.php
rename to test/Services/Account/AccountServiceTest.php
index 54918131..fe2b3945 100644
--- a/tests/Services/Account/AccountServiceTest.php
+++ b/test/Services/Account/AccountServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Account\AccountRequest;
 use SP\Account\AccountSearchFilter;
@@ -37,9 +37,9 @@ use SP\Services\Account\AccountPasswordRequest;
 use SP\Services\Account\AccountService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountServiceTest
diff --git a/tests/Services/Account/AccountToFavoriteServiceTest.php b/test/Services/Account/AccountToFavoriteServiceTest.php
similarity index 96%
rename from tests/Services/Account/AccountToFavoriteServiceTest.php
rename to test/Services/Account/AccountToFavoriteServiceTest.php
index 8a385d28..6b3fe6b3 100644
--- a/tests/Services/Account/AccountToFavoriteServiceTest.php
+++ b/test/Services/Account/AccountToFavoriteServiceTest.php
@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\Services\Account\AccountToFavoriteService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountFavoriteServiceTest
diff --git a/tests/Services/Account/AccountToTagServiceTest.php b/test/Services/Account/AccountToTagServiceTest.php
similarity index 94%
rename from tests/Services/Account/AccountToTagServiceTest.php
rename to test/Services/Account/AccountToTagServiceTest.php
index 07967604..8d8bbf95 100644
--- a/tests/Services/Account/AccountToTagServiceTest.php
+++ b/test/Services/Account/AccountToTagServiceTest.php
@@ -22,12 +22,12 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Account;
+namespace SP\Test\Services\Account;
 
 use SP\Services\Account\AccountToTagService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class AccountToTagServiceTest
diff --git a/tests/Services/Api/ApiRequestTest.php b/test/Services/Api/ApiRequestTest.php
similarity index 97%
rename from tests/Services/Api/ApiRequestTest.php
rename to test/Services/Api/ApiRequestTest.php
index 2184c226..4f28b5c6 100644
--- a/tests/Services/Api/ApiRequestTest.php
+++ b/test/Services/Api/ApiRequestTest.php
@@ -22,12 +22,12 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Api;
+namespace SP\Test\Services\Api;
 
 use PHPUnit\Framework\TestCase;
 use SP\Services\Api\ApiRequest;
 use SP\Services\Api\ApiRequestException;
-use function SP\Tests\getResource;
+use function SP\Test\getResource;
 
 /**
  * Class ApiRequestTest
diff --git a/tests/Services/Api/ApiServiceTest.php b/test/Services/Api/ApiServiceTest.php
similarity index 97%
rename from tests/Services/Api/ApiServiceTest.php
rename to test/Services/Api/ApiServiceTest.php
index e2026b11..cb29f845 100644
--- a/tests/Services/Api/ApiServiceTest.php
+++ b/test/Services/Api/ApiServiceTest.php
@@ -22,16 +22,16 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Api;
+namespace SP\Test\Services\Api;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Services\Api\ApiRequest;
 use SP\Services\Api\ApiService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\getResource;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\getResource;
+use function SP\Test\setupContext;
 
 /**
  * Class ApiServiceTest
diff --git a/tests/Services/AuthToken/AuthTokenServiceTest.php b/test/Services/AuthToken/AuthTokenServiceTest.php
similarity index 98%
rename from tests/Services/AuthToken/AuthTokenServiceTest.php
rename to test/Services/AuthToken/AuthTokenServiceTest.php
index ef086031..741c4c01 100644
--- a/tests/Services/AuthToken/AuthTokenServiceTest.php
+++ b/test/Services/AuthToken/AuthTokenServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\AuthToken;
+namespace SP\Test\Services\AuthToken;
 
 use Defuse\Crypto\Exception\CryptoException;
 use SP\Core\Acl\ActionsInterface;
@@ -35,9 +35,9 @@ use SP\Repositories\NoSuchItemException;
 use SP\Services\AuthToken\AuthTokenService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class AuthTokenServiceTest
diff --git a/tests/Services/Backup/FileBackupServiceTest.php b/test/Services/Backup/FileBackupServiceTest.php
similarity index 95%
rename from tests/Services/Backup/FileBackupServiceTest.php
rename to test/Services/Backup/FileBackupServiceTest.php
index 396e03c1..aa1f4525 100644
--- a/tests/Services/Backup/FileBackupServiceTest.php
+++ b/test/Services/Backup/FileBackupServiceTest.php
@@ -22,11 +22,11 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Backup;
+namespace SP\Test\Services\Backup;
 
 use PHPUnit\Framework\TestCase;
 use SP\Services\Backup\FileBackupService;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class FileBackupServiceTest
diff --git a/tests/Services/Category/CategoryServiceTest.php b/test/Services/Category/CategoryServiceTest.php
similarity index 98%
rename from tests/Services/Category/CategoryServiceTest.php
rename to test/Services/Category/CategoryServiceTest.php
index 788bdd83..5d7953df 100644
--- a/tests/Services/Category/CategoryServiceTest.php
+++ b/test/Services/Category/CategoryServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Category;
+namespace SP\Test\Services\Category;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\CategoryData;
@@ -31,8 +31,8 @@ use SP\Repositories\DuplicatedItemException;
 use SP\Repositories\NoSuchItemException;
 use SP\Services\Category\CategoryService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CategoryServiceTest
diff --git a/tests/Services/Client/ClientServiceTest.php b/test/Services/Client/ClientServiceTest.php
similarity index 98%
rename from tests/Services/Client/ClientServiceTest.php
rename to test/Services/Client/ClientServiceTest.php
index 94b28742..fde141ba 100644
--- a/tests/Services/Client/ClientServiceTest.php
+++ b/test/Services/Client/ClientServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Client;
+namespace SP\Test\Services\Client;
 
 use SP\Core\Context\ContextInterface;
 use SP\Core\Exceptions\ConstraintException;
@@ -34,8 +34,8 @@ use SP\Services\Client\ClientService;
 use SP\Services\ServiceException;
 use SP\Services\User\UserLoginResponse;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class ClientServiceTest
diff --git a/tests/Services/Config/ConfigBackupServiceTest.php b/test/Services/Config/ConfigBackupServiceTest.php
similarity index 97%
rename from tests/Services/Config/ConfigBackupServiceTest.php
rename to test/Services/Config/ConfigBackupServiceTest.php
index 7885c00b..484e04c3 100644
--- a/tests/Services/Config/ConfigBackupServiceTest.php
+++ b/test/Services/Config/ConfigBackupServiceTest.php
@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Config;
+namespace SP\Test\Services\Config;
 
 use PHPUnit\Framework\TestCase;
 use SP\Config\Config;
 use SP\Config\ConfigData;
 use SP\Services\Config\ConfigBackupService;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class ConfigBackupServiceTest
diff --git a/tests/Services/Config/ConfigServiceTest.php b/test/Services/Config/ConfigServiceTest.php
similarity index 98%
rename from tests/Services/Config/ConfigServiceTest.php
rename to test/Services/Config/ConfigServiceTest.php
index 8c9bb779..e4096b78 100644
--- a/tests/Services/Config/ConfigServiceTest.php
+++ b/test/Services/Config/ConfigServiceTest.php
@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Config;
+namespace SP\Test\Services\Config;
 
 use SP\DataModel\ConfigData;
 use SP\DataModel\Dto\ConfigRequest;
 use SP\Repositories\NoSuchItemException;
 use SP\Services\Config\ConfigService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class ConfigServiceTest
diff --git a/tests/Services/Crypt/MasterPassServiceTest.php b/test/Services/Crypt/MasterPassServiceTest.php
similarity index 97%
rename from tests/Services/Crypt/MasterPassServiceTest.php
rename to test/Services/Crypt/MasterPassServiceTest.php
index 579aa9e4..82191931 100644
--- a/tests/Services/Crypt/MasterPassServiceTest.php
+++ b/test/Services/Crypt/MasterPassServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Crypt;
+namespace SP\Test\Services\Crypt;
 
 use SP\Core\Crypt\Crypt;
 use SP\Services\Account\AccountService;
@@ -30,9 +30,9 @@ use SP\Services\Crypt\MasterPassService;
 use SP\Services\Crypt\UpdateMasterPassRequest;
 use SP\Services\CustomField\CustomFieldService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use SP\Tests\Services\Account\AccountCryptServiceTest;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use SP\Test\Services\Account\AccountCryptServiceTest;
+use function SP\Test\setupContext;
 
 /**
  * Class MasterPassServiceTest
diff --git a/tests/Services/Crypt/SecureSessionServiceTest.php b/test/Services/Crypt/SecureSessionServiceTest.php
similarity index 95%
rename from tests/Services/Crypt/SecureSessionServiceTest.php
rename to test/Services/Crypt/SecureSessionServiceTest.php
index 7644cbbb..24f46445 100644
--- a/tests/Services/Crypt/SecureSessionServiceTest.php
+++ b/test/Services/Crypt/SecureSessionServiceTest.php
@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Crypt;
+namespace SP\Test\Services\Crypt;
 
 use Defuse\Crypto\Key;
 use PHPUnit\Framework\TestCase;
 use SP\Core\Crypt\UUIDCookie;
 use SP\Services\Crypt\SecureSessionService;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class SecureSessionServiceTest
diff --git a/tests/Services/Crypt/TemporaryMasterPassServiceTest.php b/test/Services/Crypt/TemporaryMasterPassServiceTest.php
similarity index 97%
rename from tests/Services/Crypt/TemporaryMasterPassServiceTest.php
rename to test/Services/Crypt/TemporaryMasterPassServiceTest.php
index 19a06446..d3bebc55 100644
--- a/tests/Services/Crypt/TemporaryMasterPassServiceTest.php
+++ b/test/Services/Crypt/TemporaryMasterPassServiceTest.php
@@ -22,13 +22,13 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Crypt;
+namespace SP\Test\Services\Crypt;
 
 use Defuse\Crypto\Exception\CryptoException;
 use PHPUnit\Framework\TestCase;
 use SP\Core\Context\ContextInterface;
 use SP\Services\Crypt\TemporaryMasterPassService;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class TemporaryMasterPassServiceTest
diff --git a/tests/Services/CustomField/CustomFieldCryptServiceTest.php b/test/Services/CustomField/CustomFieldCryptServiceTest.php
similarity index 94%
rename from tests/Services/CustomField/CustomFieldCryptServiceTest.php
rename to test/Services/CustomField/CustomFieldCryptServiceTest.php
index ef37cfbb..990e1e72 100644
--- a/tests/Services/CustomField/CustomFieldCryptServiceTest.php
+++ b/test/Services/CustomField/CustomFieldCryptServiceTest.php
@@ -22,16 +22,16 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\CustomField;
+namespace SP\Test\Services\CustomField;
 
 use SP\Core\Crypt\Crypt;
 use SP\Services\Crypt\UpdateMasterPassRequest;
 use SP\Services\CustomField\CustomFieldCryptService;
 use SP\Services\CustomField\CustomFieldService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use SP\Tests\Services\Account\AccountCryptServiceTest;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use SP\Test\Services\Account\AccountCryptServiceTest;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldCryptServiceTest
diff --git a/tests/Services/CustomField/CustomFieldDefServiceTest.php b/test/Services/CustomField/CustomFieldDefServiceTest.php
similarity index 98%
rename from tests/Services/CustomField/CustomFieldDefServiceTest.php
rename to test/Services/CustomField/CustomFieldDefServiceTest.php
index 0a34cd27..2f5548a2 100644
--- a/tests/Services/CustomField/CustomFieldDefServiceTest.php
+++ b/test/Services/CustomField/CustomFieldDefServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\CustomField;
+namespace SP\Test\Services\CustomField;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Exceptions\ConstraintException;
@@ -32,8 +32,8 @@ use SP\Repositories\NoSuchItemException;
 use SP\Services\CustomField\CustomFieldDefService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldDefServiceTest
diff --git a/tests/Services/CustomField/CustomFieldServiceTest.php b/test/Services/CustomField/CustomFieldServiceTest.php
similarity index 98%
rename from tests/Services/CustomField/CustomFieldServiceTest.php
rename to test/Services/CustomField/CustomFieldServiceTest.php
index a8ce9faa..4f97f352 100644
--- a/tests/Services/CustomField/CustomFieldServiceTest.php
+++ b/test/Services/CustomField/CustomFieldServiceTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\CustomField;
+namespace SP\Test\Services\CustomField;
 
 use SP\Core\Acl\ActionsInterface;
 use SP\Core\Crypt\Crypt;
@@ -31,9 +31,9 @@ use SP\DataModel\CustomFieldData;
 use SP\Repositories\NoSuchItemException;
 use SP\Services\CustomField\CustomFieldService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use SP\Tests\Services\Account\AccountCryptServiceTest;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use SP\Test\Services\Account\AccountCryptServiceTest;
+use function SP\Test\setupContext;
 
 /**
  * Class CustomFieldServiceTest
diff --git a/tests/Services/Eventlog/EventlogServiceTest.php b/test/Services/Eventlog/EventlogServiceTest.php
similarity index 97%
rename from tests/Services/Eventlog/EventlogServiceTest.php
rename to test/Services/Eventlog/EventlogServiceTest.php
index 9fa07494..b2683c22 100644
--- a/tests/Services/Eventlog/EventlogServiceTest.php
+++ b/test/Services/Eventlog/EventlogServiceTest.php
@@ -22,15 +22,15 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Eventlog;
+namespace SP\Test\Services\Eventlog;
 
 use SP\Core\Exceptions\ConstraintException;
 use SP\DataModel\EventlogData;
 use SP\DataModel\ItemSearchData;
 use SP\Services\EventLog\EventlogService;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class EventlogServiceTest
diff --git a/tests/Services/Export/XmlExportServiceTest.php b/test/Services/Export/XmlExportServiceTest.php
similarity index 97%
rename from tests/Services/Export/XmlExportServiceTest.php
rename to test/Services/Export/XmlExportServiceTest.php
index 69d56a46..08903e33 100644
--- a/tests/Services/Export/XmlExportServiceTest.php
+++ b/test/Services/Export/XmlExportServiceTest.php
@@ -22,16 +22,16 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Export;
+namespace SP\Test\Services\Export;
 
 use SP\Services\Export\VerifyResult;
 use SP\Services\Export\XmlExportService;
 use SP\Services\Export\XmlVerifyService;
 use SP\Services\ServiceException;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
+use SP\Test\DatabaseTestCase;
 use SP\Util\Util;
-use function SP\Tests\setupContext;
+use function SP\Test\setupContext;
 
 /**
  * Class XmlExportServiceTest
diff --git a/tests/Services/Import/CsvImportTest.php b/test/Services/Import/CsvImportTest.php
similarity index 98%
rename from tests/Services/Import/CsvImportTest.php
rename to test/Services/Import/CsvImportTest.php
index b58f5e8a..b88a50dd 100644
--- a/tests/Services/Import/CsvImportTest.php
+++ b/test/Services/Import/CsvImportTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Import;
+namespace SP\Test\Services\Import;
 
 use DI\Container;
 use SP\Core\Crypt\Crypt;
@@ -34,8 +34,8 @@ use SP\Services\Import\FileImport;
 use SP\Services\Import\ImportException;
 use SP\Services\Import\ImportParams;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class CsvImportTest
diff --git a/tests/Services/Import/SyspassImportTest.php b/test/Services/Import/SyspassImportTest.php
similarity index 98%
rename from tests/Services/Import/SyspassImportTest.php
rename to test/Services/Import/SyspassImportTest.php
index 94f87ef4..97e8fcbe 100644
--- a/tests/Services/Import/SyspassImportTest.php
+++ b/test/Services/Import/SyspassImportTest.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests\Services\Import;
+namespace SP\Test\Services\Import;
 
 use DI\Container;
 use SP\Core\Crypt\Crypt;
@@ -35,8 +35,8 @@ use SP\Services\Import\ImportParams;
 use SP\Services\Import\SyspassImport;
 use SP\Services\Import\XmlFileImport;
 use SP\Storage\Database\DatabaseConnectionData;
-use SP\Tests\DatabaseTestCase;
-use function SP\Tests\setupContext;
+use SP\Test\DatabaseTestCase;
+use function SP\Test\setupContext;
 
 /**
  * Class SyspassImportTest
diff --git a/tests/FileHandlerTest.php b/test/Storage/FileHandlerTest.php
similarity index 98%
rename from tests/FileHandlerTest.php
rename to test/Storage/FileHandlerTest.php
index 2194137b..3d448ace 100644
--- a/tests/FileHandlerTest.php
+++ b/test/Storage/FileHandlerTest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Storage;
 
 use PHPUnit\Framework\TestCase;
 use SP\Storage\FileException;
diff --git a/tests/XmlHandlerTest.php b/test/Storage/XmlHandlerTest.php
similarity index 97%
rename from tests/XmlHandlerTest.php
rename to test/Storage/XmlHandlerTest.php
index 472d4f0a..c0422623 100644
--- a/tests/XmlHandlerTest.php
+++ b/test/Storage/XmlHandlerTest.php
@@ -2,8 +2,8 @@
 /**
  * sysPass
  *
- * @author    nuxsmin
- * @link      https://syspass.org
+ * @author nuxsmin
+ * @link https://syspass.org
  * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test\Storage;
 
 use PHPUnit\Framework\TestCase;
 use SP\Storage\FileException;
diff --git a/tests/bootstrap.php b/test/bootstrap.php
similarity index 99%
rename from tests/bootstrap.php
rename to test/bootstrap.php
index 49025240..a8d03262 100644
--- a/tests/bootstrap.php
+++ b/test/bootstrap.php
@@ -22,7 +22,7 @@
  *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Tests;
+namespace SP\Test;
 
 use DI\ContainerBuilder;
 use Doctrine\Common\Cache\ArrayCache;
@@ -35,7 +35,7 @@ use SP\Storage\Database\DatabaseConnectionData;
 define('APP_MODULE', 'tests');
 
 define('APP_ROOT', dirname(__DIR__));
-define('TEST_ROOT', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'tests');
+define('TEST_ROOT', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'test');
 define('RESOURCE_DIR', TEST_ROOT . DIRECTORY_SEPARATOR . 'res');
 define('TMP_DIR', TEST_ROOT . DIRECTORY_SEPARATOR . 'tmp');
 define('CONFIG_PATH', RESOURCE_DIR . DIRECTORY_SEPARATOR . 'config');
diff --git a/tests/res/.blank b/test/res/.blank
similarity index 100%
rename from tests/res/.blank
rename to test/res/.blank
diff --git a/tests/res/config/actions.xml b/test/res/config/actions.xml
similarity index 100%
rename from tests/res/config/actions.xml
rename to test/res/config/actions.xml
diff --git a/tests/res/datasets/syspass.xml b/test/res/datasets/syspass.xml
similarity index 100%
rename from tests/res/datasets/syspass.xml
rename to test/res/datasets/syspass.xml
diff --git a/tests/res/datasets/syspass_account.xml b/test/res/datasets/syspass_account.xml
similarity index 100%
rename from tests/res/datasets/syspass_account.xml
rename to test/res/datasets/syspass_account.xml
diff --git a/tests/res/datasets/syspass_accountAcl.xml b/test/res/datasets/syspass_accountAcl.xml
similarity index 100%
rename from tests/res/datasets/syspass_accountAcl.xml
rename to test/res/datasets/syspass_accountAcl.xml
diff --git a/tests/res/datasets/syspass_accountCrypt.xml b/test/res/datasets/syspass_accountCrypt.xml
similarity index 100%
rename from tests/res/datasets/syspass_accountCrypt.xml
rename to test/res/datasets/syspass_accountCrypt.xml
diff --git a/tests/res/datasets/syspass_accountFavorite.xml b/test/res/datasets/syspass_accountFavorite.xml
similarity index 100%
rename from tests/res/datasets/syspass_accountFavorite.xml
rename to test/res/datasets/syspass_accountFavorite.xml
diff --git a/tests/res/datasets/syspass_accountFile.xml b/test/res/datasets/syspass_accountFile.xml
similarity index 100%
rename from tests/res/datasets/syspass_accountFile.xml
rename to test/res/datasets/syspass_accountFile.xml
diff --git a/tests/res/datasets/syspass_accountHistory.xml b/test/res/datasets/syspass_accountHistory.xml
similarity index 100%
rename from tests/res/datasets/syspass_accountHistory.xml
rename to test/res/datasets/syspass_accountHistory.xml
diff --git a/tests/res/datasets/syspass_accountSearch.xml b/test/res/datasets/syspass_accountSearch.xml
similarity index 100%
rename from tests/res/datasets/syspass_accountSearch.xml
rename to test/res/datasets/syspass_accountSearch.xml
diff --git a/tests/res/datasets/syspass_authToken.xml b/test/res/datasets/syspass_authToken.xml
similarity index 100%
rename from tests/res/datasets/syspass_authToken.xml
rename to test/res/datasets/syspass_authToken.xml
diff --git a/tests/res/datasets/syspass_config.xml b/test/res/datasets/syspass_config.xml
similarity index 100%
rename from tests/res/datasets/syspass_config.xml
rename to test/res/datasets/syspass_config.xml
diff --git a/tests/res/datasets/syspass_customField.xml b/test/res/datasets/syspass_customField.xml
similarity index 100%
rename from tests/res/datasets/syspass_customField.xml
rename to test/res/datasets/syspass_customField.xml
diff --git a/tests/res/datasets/syspass_eventlog.xml b/test/res/datasets/syspass_eventlog.xml
similarity index 100%
rename from tests/res/datasets/syspass_eventlog.xml
rename to test/res/datasets/syspass_eventlog.xml
diff --git a/tests/res/datasets/syspass_import.xml b/test/res/datasets/syspass_import.xml
similarity index 100%
rename from tests/res/datasets/syspass_import.xml
rename to test/res/datasets/syspass_import.xml
diff --git a/tests/res/datasets/syspass_plugin.xml b/test/res/datasets/syspass_plugin.xml
similarity index 100%
rename from tests/res/datasets/syspass_plugin.xml
rename to test/res/datasets/syspass_plugin.xml
diff --git a/tests/res/datasets/syspass_track.xml b/test/res/datasets/syspass_track.xml
similarity index 100%
rename from tests/res/datasets/syspass_track.xml
rename to test/res/datasets/syspass_track.xml
diff --git a/tests/res/imgs/add.png b/test/res/imgs/add.png
similarity index 100%
rename from tests/res/imgs/add.png
rename to test/res/imgs/add.png
diff --git a/tests/res/import/data.csv b/test/res/import/data.csv
similarity index 100%
rename from tests/res/import/data.csv
rename to test/res/import/data.csv
diff --git a/tests/res/import/data_invalid.csv b/test/res/import/data_invalid.csv
similarity index 100%
rename from tests/res/import/data_invalid.csv
rename to test/res/import/data_invalid.csv
diff --git a/tests/res/import/data_syspass.xml b/test/res/import/data_syspass.xml
similarity index 100%
rename from tests/res/import/data_syspass.xml
rename to test/res/import/data_syspass.xml
diff --git a/tests/res/import/data_syspass_invalid.xml b/test/res/import/data_syspass_invalid.xml
similarity index 100%
rename from tests/res/import/data_syspass_invalid.xml
rename to test/res/import/data_syspass_invalid.xml
diff --git a/tests/res/json/account_add.json b/test/res/json/account_add.json
similarity index 100%
rename from tests/res/json/account_add.json
rename to test/res/json/account_add.json
diff --git a/tests/res/json/account_search.json b/test/res/json/account_search.json
similarity index 100%
rename from tests/res/json/account_search.json
rename to test/res/json/account_search.json
diff --git a/tests/res/json/account_viewPass.json b/test/res/json/account_viewPass.json
similarity index 100%
rename from tests/res/json/account_viewPass.json
rename to test/res/json/account_viewPass.json