diff --git a/tests/SPT/Config/ConfigTest.php b/tests/SPT/Config/ConfigTest.php
deleted file mode 100644
index ce35ce9b..00000000
--- a/tests/SPT/Config/ConfigTest.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/*
- * sysPass
- *
- * @author nuxsmin
- * @link https://syspass.org
- * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
- *
- * This file is part of sysPass.
- *
- * sysPass is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sysPass is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace SPT\Config;
-
-use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
-use DI\Container;
-use DI\DependencyException;
-use DI\NotFoundException;
-use PHPUnit\Framework\TestCase;
-use SP\Core\Context\ContextException;
-use SP\Domain\Config\Adapters\ConfigData;
-use SP\Domain\Config\Ports\ConfigFileService;
-use SP\Domain\Config\Services\ConfigFile;
-use SP\Infrastructure\File\FileException;
-
-use function SPT\getResource;
-use function SPT\recreateDir;
-use function SPT\saveResource;
-use function SPT\setupContext;
-
-/**
- * Class ConfigTest
- *
- * Test de integración para comprobar el funcionamiento de la clase SP\Config\Config y sus utilidades
- *
- * @package SPT
- */
-class ConfigTest extends TestCase
-{
-    /**
-     * @var Container
-     */
-    protected static $dic;
-    /**
-     * @var string
-     */
-    protected static $currentConfig;
-
-    /**
-     * @throws ContextException
-     */
-    public static function setUpBeforeClass(): void
-    {
-        self::$dic = setupContext();
-
-        // Save current config
-        self::$currentConfig = getResource('config', 'config.xml');
-    }
-
-    /**
-     * This method is called after the last test of this test class is run.
-     */
-    public static function tearDownAfterClass(): void
-    {
-        // Restore to the initial state
-        saveResource('config', 'config.xml', self::$currentConfig);
-        recreateDir(CACHE_PATH);
-    }
-
-    /**
-     * Comprobar la carga de la configuración
-     *
-     * @throws DependencyException
-     * @throws NotFoundException
-     */
-    public function testLoadClass(): ConfigFileService
-    {
-        $config = self::$dic->get(ConfigFile::class);
-
-        $this->assertInstanceOf(ConfigFile::class, $config);
-        $this->assertFileExists(CONFIG_FILE);
-
-        return $config;
-    }
-
-    /**
-     * Comprobar que la configuración se guarda correctamente
-     *
-     * @depends testLoadClass
-     *
-     * @param ConfigFileService $config
-     *
-     * @throws FileException
-     */
-    public function testSaveConfig(ConfigFileService $config)
-    {
-        $config->save($config->getConfigData(), false);
-
-        $this->assertFileExists(CONFIG_FILE);
-    }
-
-
-    /**
-     * Comprobar la carga de la configuración en el contexto
-     *
-     * @depends testLoadClass
-     *
-     * @param ConfigFileService $config
-     */
-    public function testLoadConfig(ConfigFileService $config)
-    {
-        $this->assertInstanceOf(ConfigData::class, $config->reload());
-    }
-
-    /**
-     * Comprobar la actualización de la configuración
-     *
-     * @depends testLoadClass
-     *
-     * @param ConfigFileService $config
-     */
-    public function testUpdateConfig(ConfigFileService $config)
-    {
-        $config->update($config->getConfigData());
-
-        $this->assertEquals(ConfigFile::getTimeUpdated(), $config->getConfigData()->getConfigDate());
-    }
-
-    /**
-     * Comprobar la generación de una clave de actualización y que su longitud es correcta
-     *
-     * @depends testLoadClass
-     *
-     * @param ConfigFileService $config
-     *
-     * @throws EnvironmentIsBrokenException
-     * @throws FileException
-     */
-    public function testGenerateUpgradeKey(ConfigFileService $config)
-    {
-        $config->generateUpgradeKey();
-
-        $this->assertEquals(32, strlen($config->getConfigData()->getUpgradeKey()));
-    }
-}
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index c9f59043..78155f51 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -4,7 +4,7 @@
   ~
   ~ @author nuxsmin
   ~ @link https://syspass.org
-  ~ @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+  ~ @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
   ~
   ~ This file is part of sysPass.
   ~
@@ -40,21 +40,14 @@
     </coverage>
     <testsuites>
         <testsuite name="core">
-            <directory suffix=".php">./SPT</directory>
-            <exclude>./SPT/Modules</exclude>
-            <exclude>./SPT/Services/Install/</exclude>
-            <exclude>./SPT/Services/Backup</exclude>
-            <exclude>./SPT/Generators</exclude>
-            <exclude>./SPT/Domain/Account/Search/AccountSearchTokenizerDataTrait.php</exclude>
-            <exclude>./SPT/DatabaseTestCase.php</exclude>
-            <exclude>./SPT/DatabaseTrait.php</exclude>
-            <exclude>./SPT/DatabaseUtil.php</exclude>
-            <exclude>./SPT/PHPUnitHelper.php</exclude>
-            <exclude>./SPT/UnitaryTestCase.php</exclude>
-            <exclude>./SPT/bootstrap.php</exclude>
-            <exclude>./SPT/Stubs/AccountRepositoryStub.php</exclude>
-            <exclude>./SPT/Stubs/PublicLinkRepositoryStub.php</exclude>
-            <exclude>./SPT/WebTestCase.php</exclude>
+            <directory suffix=".php">./SPT/Core</directory>
+            <directory suffix=".php">./SPT/Domain</directory>
+            <directory suffix=".php">./SPT/Html</directory>
+            <directory suffix=".php">./SPT/Http</directory>
+            <directory suffix=".php">./SPT/Infrastructure</directory>
+            <directory suffix=".php">./SPT/Mvc</directory>
+            <directory suffix=".php">./SPT/Providers</directory>
+            <directory suffix=".php">./SPT/Util</directory>
         </testsuite>
         <testsuite name="api">
             <directory suffix=".php">./SPT/Modules/Api</directory>