diff --git a/tests/php/Unit/Activity/FileSignedTest.php b/tests/php/Unit/Activity/FileSignedTest.php
index 9aa827df99..22bf8c4304 100644
--- a/tests/php/Unit/Activity/FileSignedTest.php
+++ b/tests/php/Unit/Activity/FileSignedTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Activity\Settings;
+namespace OCA\Libresign\Tests\Unit\Activity;
 
 use OCA\Libresign\Activity\Settings\FileSigned;
 use OCA\Libresign\Events\SignedEvent;
diff --git a/tests/php/Unit/CapabilitiesTest.php b/tests/php/Unit/CapabilitiesTest.php
index edb0f5722d..b2286919c1 100644
--- a/tests/php/Unit/CapabilitiesTest.php
+++ b/tests/php/Unit/CapabilitiesTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit;
+
 /**
  * SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Controller/AEnvironmentPageAwareControllerTest.php b/tests/php/Unit/Controller/AEnvironmentPageAwareControllerTest.php
index aa0e0ba5ef..07efdc82f0 100644
--- a/tests/php/Unit/Controller/AEnvironmentPageAwareControllerTest.php
+++ b/tests/php/Unit/Controller/AEnvironmentPageAwareControllerTest.php
@@ -6,13 +6,14 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit;
+namespace OCA\Libresign\Tests\Unit\Controller;
 
 use OCA\Files_Trashbin\Trash\ITrashManager;
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Controller\AEnvironmentPageAwareController;
 use OCA\Libresign\Exception\LibresignException;
 use OCA\Libresign\Service\SignFileService;
+use OCA\Libresign\Tests\Unit\TestCase;
 use OCP\Files\IRootFolder;
 use OCP\IL10N;
 use OCP\IRequest;
diff --git a/tests/php/Unit/DataObjects/VisibleElementAssocTest.php b/tests/php/Unit/DataObjects/VisibleElementAssocTest.php
index 9cfa53ab30..0353e96561 100644
--- a/tests/php/Unit/DataObjects/VisibleElementAssocTest.php
+++ b/tests/php/Unit/DataObjects/VisibleElementAssocTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit\Service;
+namespace OCA\Libresign\Tests\Unit\DataObjects;
 
 use OCA\Libresign\DataObjects\VisibleElementAssoc;
 use OCA\Libresign\Db\FileElement;
diff --git a/tests/php/Unit/Events/SignedEventFactoryTest.php b/tests/php/Unit/Events/SignedEventFactoryTest.php
index cd7fff26e0..fee04ab45a 100644
--- a/tests/php/Unit/Events/SignedEventFactoryTest.php
+++ b/tests/php/Unit/Events/SignedEventFactoryTest.php
@@ -2,6 +2,9 @@
 
 declare(strict_types=1);
 
+
+namespace OCA\Libresign\Tests\Unit\Events;
+
 use OCA\Libresign\Db\File as FileEntity;
 use OCA\Libresign\Db\SignRequest;
 use OCA\Libresign\Events\SignedEventFactory;
diff --git a/tests/php/Unit/Handler/CertificateEngine/AEngineHandlerTest.php b/tests/php/Unit/Handler/CertificateEngine/AEngineHandlerTest.php
index 95190ebec4..6b6aada788 100644
--- a/tests/php/Unit/Handler/CertificateEngine/AEngineHandlerTest.php
+++ b/tests/php/Unit/Handler/CertificateEngine/AEngineHandlerTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Handler\CertificateEngine;
+
 /**
  * SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Handler/CertificateEngine/CertificateEngineFactoryTest.php b/tests/php/Unit/Handler/CertificateEngine/CertificateEngineFactoryTest.php
index 56a4c12354..45fc55c35d 100644
--- a/tests/php/Unit/Handler/CertificateEngine/CertificateEngineFactoryTest.php
+++ b/tests/php/Unit/Handler/CertificateEngine/CertificateEngineFactoryTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Handler\CertificateEngine;
+
 /**
  * SPDX-FileCopyrightText: 2020-2024 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Handler/CertificateEngine/CertificateHelperTest.php b/tests/php/Unit/Handler/CertificateEngine/CertificateHelperTest.php
index 0781a3086b..e1e6d05347 100644
--- a/tests/php/Unit/Handler/CertificateEngine/CertificateHelperTest.php
+++ b/tests/php/Unit/Handler/CertificateEngine/CertificateHelperTest.php
@@ -2,6 +2,9 @@
 
 declare(strict_types=1);
 
+
+namespace OCA\Libresign\Tests\Unit\Handler\CertificateEngine;
+
 use bovigo\vfs\vfsStream;
 use OCA\Libresign\Exception\LibresignException;
 use OCA\Libresign\Handler\CertificateEngine\CertificateHelper;
diff --git a/tests/php/Unit/Handler/CertificateEngine/OpenSslHandlerTest.php b/tests/php/Unit/Handler/CertificateEngine/OpenSslHandlerTest.php
index 491172e765..4733a3791d 100644
--- a/tests/php/Unit/Handler/CertificateEngine/OpenSslHandlerTest.php
+++ b/tests/php/Unit/Handler/CertificateEngine/OpenSslHandlerTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Handler\CertificateEngine;
+
 /**
  * SPDX-FileCopyrightText: 2020-2024 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Handler/CertificateEngine/OrderCertificatesTraitTest.php b/tests/php/Unit/Handler/CertificateEngine/OrderCertificatesTraitTest.php
index 6c857d377e..afb2de9581 100644
--- a/tests/php/Unit/Handler/CertificateEngine/OrderCertificatesTraitTest.php
+++ b/tests/php/Unit/Handler/CertificateEngine/OrderCertificatesTraitTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit;
+namespace OCA\Libresign\Tests\Unit\Handler\CertificateEngine;
 
 use OCA\Libresign\Handler\CertificateEngine\OrderCertificatesTrait;
 
diff --git a/tests/php/Unit/Handler/FooterHandlerTest.php b/tests/php/Unit/Handler/FooterHandlerTest.php
index a28a52cb4e..fc9864e5da 100644
--- a/tests/php/Unit/Handler/FooterHandlerTest.php
+++ b/tests/php/Unit/Handler/FooterHandlerTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Handler;
+
 /**
  * SPDX-FileCopyrightText: 2020-2024 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Handler/PdfTest.php b/tests/php/Unit/Handler/PdfTest.php
index 3973ea51ca..60ddad695f 100644
--- a/tests/php/Unit/Handler/PdfTest.php
+++ b/tests/php/Unit/Handler/PdfTest.php
@@ -2,6 +2,9 @@
 
 declare(strict_types=1);
 
+
+namespace OCA\Libresign\Tests\Unit\Handler;
+
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Exception\LibresignException;
 use OCA\Libresign\Handler\PdfTk\Pdf;
@@ -10,6 +13,7 @@
 use OCP\IL10N;
 use OCP\L10N\IFactory as IL10NFactory;
 use PHPUnit\Framework\MockObject\MockObject;
+use RuntimeException;
 
 /**
  * SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
diff --git a/tests/php/Unit/Handler/SignEngine/JSignPdfHandlerTest.php b/tests/php/Unit/Handler/SignEngine/JSignPdfHandlerTest.php
index c235387e50..8a07c3c03b 100644
--- a/tests/php/Unit/Handler/SignEngine/JSignPdfHandlerTest.php
+++ b/tests/php/Unit/Handler/SignEngine/JSignPdfHandlerTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit\Service;
+namespace OCA\Libresign\Tests\Unit\Handler\SignEngine;
 
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\DataObjects\VisibleElementAssoc;
diff --git a/tests/php/Unit/Handler/SignEngine/Pkcs12HandlerTest.php b/tests/php/Unit/Handler/SignEngine/Pkcs12HandlerTest.php
index d0cd90ac18..0d867d6193 100644
--- a/tests/php/Unit/Handler/SignEngine/Pkcs12HandlerTest.php
+++ b/tests/php/Unit/Handler/SignEngine/Pkcs12HandlerTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Handler\SignEngine;
+
 /**
  * SPDX-FileCopyrightText: 2020-2024 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Handler/SignEngine/Pkcs7HandlerTest.php b/tests/php/Unit/Handler/SignEngine/Pkcs7HandlerTest.php
index 6c87df8dd9..b5aa26bf75 100644
--- a/tests/php/Unit/Handler/SignEngine/Pkcs7HandlerTest.php
+++ b/tests/php/Unit/Handler/SignEngine/Pkcs7HandlerTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Handler\SignEngine;
+
 /**
  * SPDX-FileCopyrightText: 2020-2024 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Handler/SignEngine/SignEngineFactoryTest.php b/tests/php/Unit/Handler/SignEngine/SignEngineFactoryTest.php
index e4aee19116..dae53149b4 100644
--- a/tests/php/Unit/Handler/SignEngine/SignEngineFactoryTest.php
+++ b/tests/php/Unit/Handler/SignEngine/SignEngineFactoryTest.php
@@ -2,6 +2,9 @@
 
 declare(strict_types=1);
 
+
+namespace OCA\Libresign\Tests\Unit\Handler\SignEngine;
+
 use OCA\Libresign\Handler\SignEngine\Pkcs12Handler;
 use OCA\Libresign\Handler\SignEngine\Pkcs7Handler;
 use OCA\Libresign\Handler\SignEngine\SignEngineFactory;
diff --git a/tests/php/Unit/Middleware/InjectionMiddlewareTest.php b/tests/php/Unit/Middleware/InjectionMiddlewareTest.php
index 344c4b158a..3ae14dc650 100644
--- a/tests/php/Unit/Middleware/InjectionMiddlewareTest.php
+++ b/tests/php/Unit/Middleware/InjectionMiddlewareTest.php
@@ -2,6 +2,9 @@
 
 declare(strict_types=1);
 
+
+namespace OCA\Libresign\Tests\Unit\Middleware;
+
 use OC\AppFramework\Bootstrap\Coordinator;
 use OC\AppFramework\Services\InitialState;
 use OC\InitialStateService;
diff --git a/tests/php/Unit/Service/Certificate/RulesServiceTest.php b/tests/php/Unit/Service/Certificate/RulesServiceTest.php
index 7dbf9fe64a..73c8318ef1 100644
--- a/tests/php/Unit/Service/Certificate/RulesServiceTest.php
+++ b/tests/php/Unit/Service/Certificate/RulesServiceTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit\Service;
+namespace OCA\Libresign\Tests\Unit\Service\Certificate;
 
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Service\Certificate\RulesService;
diff --git a/tests/php/Unit/Service/IdentifyMethod/AccountTest.php b/tests/php/Unit/Service/IdentifyMethod/AccountTest.php
index 364f8dd8c7..f1f974ebce 100644
--- a/tests/php/Unit/Service/IdentifyMethod/AccountTest.php
+++ b/tests/php/Unit/Service/IdentifyMethod/AccountTest.php
@@ -5,7 +5,7 @@
  * SPDX-FileCopyrightText: 2020-2025 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\Libresign\Tests\Unit\Service\IdentifyMethod\SignatureMethod;
+namespace OCA\Libresign\Tests\Unit\Service\IdentifyMethod;
 
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Db\IdentifyMethod;
diff --git a/tests/php/Unit/Service/IdentifyMethod/EmailTest.php b/tests/php/Unit/Service/IdentifyMethod/EmailTest.php
index e9e1391b49..91db93101c 100644
--- a/tests/php/Unit/Service/IdentifyMethod/EmailTest.php
+++ b/tests/php/Unit/Service/IdentifyMethod/EmailTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit\Service;
+namespace OCA\Libresign\Tests\Unit\Service\IdentifyMethod;
 
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Db\FileElementMapper;
diff --git a/tests/php/Unit/Service/IdentifyMethod/PasswordTest.php b/tests/php/Unit/Service/IdentifyMethod/PasswordTest.php
index 2492b17fb9..d87aea1f87 100644
--- a/tests/php/Unit/Service/IdentifyMethod/PasswordTest.php
+++ b/tests/php/Unit/Service/IdentifyMethod/PasswordTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit\Service;
+namespace OCA\Libresign\Tests\Unit\Service\IdentifyMethod;
 
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Exception\LibresignException;
diff --git a/tests/php/Unit/Service/IdentifyMethod/SignatureMethod/EmailTokenTest.php b/tests/php/Unit/Service/IdentifyMethod/SignatureMethod/EmailTokenTest.php
index 380d809fcd..014948b23b 100644
--- a/tests/php/Unit/Service/IdentifyMethod/SignatureMethod/EmailTokenTest.php
+++ b/tests/php/Unit/Service/IdentifyMethod/SignatureMethod/EmailTokenTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit\Service;
+namespace OCA\Libresign\Tests\Unit\Service\IdentifyMethod\SignatureMethod;
 
 use OCA\Libresign\Db\IdentifyMethod;
 use OCA\Libresign\Service\IdentifyMethod\IdentifyService;
diff --git a/tests/php/Unit/Service/Install/SignSetupServiceTest.php b/tests/php/Unit/Service/Install/SignSetupServiceTest.php
index bdb5e8a04f..645e560664 100644
--- a/tests/php/Unit/Service/Install/SignSetupServiceTest.php
+++ b/tests/php/Unit/Service/Install/SignSetupServiceTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit\Service;
+namespace OCA\Libresign\Tests\Unit\Service\Install;
 
 use bovigo\vfs\vfsStream;
 use OC\IntegrityCheck\Helpers\EnvironmentHelper;
diff --git a/tests/php/Unit/Service/ReminderServiceTest.php b/tests/php/Unit/Service/ReminderServiceTest.php
index f696f11162..5d7b0a2755 100644
--- a/tests/php/Unit/Service/ReminderServiceTest.php
+++ b/tests/php/Unit/Service/ReminderServiceTest.php
@@ -7,6 +7,10 @@
 
 declare(strict_types=1);
 
+
+namespace OCA\Libresign\Tests\Unit\Service;
+
+use DateTime;
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Db\SignRequestMapper;
 use OCA\Libresign\Service\IdentifyMethodService;
diff --git a/tests/php/Unit/Service/RequestSignatureServiceTest.php b/tests/php/Unit/Service/RequestSignatureServiceTest.php
index 40ffd91143..40ce661ba3 100644
--- a/tests/php/Unit/Service/RequestSignatureServiceTest.php
+++ b/tests/php/Unit/Service/RequestSignatureServiceTest.php
@@ -7,6 +7,9 @@
 
 declare(strict_types=1);
 
+
+namespace OCA\Libresign\Tests\Unit\Service;
+
 use OCA\Libresign\Db\FileElementMapper;
 use OCA\Libresign\Db\FileMapper;
 use OCA\Libresign\Db\IdentifyMethodMapper;
diff --git a/tests/php/Unit/Service/SignFileServiceTest.php b/tests/php/Unit/Service/SignFileServiceTest.php
index 39a8093a21..772bc7c55a 100644
--- a/tests/php/Unit/Service/SignFileServiceTest.php
+++ b/tests/php/Unit/Service/SignFileServiceTest.php
@@ -1,12 +1,16 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Service;
+
 /**
  * SPDX-FileCopyrightText: 2020-2024 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 use bovigo\vfs\vfsStream;
+use DateTime;
 use OC\User\NoUserException;
 use OCA\Libresign\BackgroundJob\SignSingleFileJob;
 use OCA\Libresign\Db\File;
diff --git a/tests/php/Unit/Service/SignRequest/StatusServiceTest.php b/tests/php/Unit/Service/SignRequest/StatusServiceTest.php
index cb4391bcc5..73268939de 100644
--- a/tests/php/Unit/Service/SignRequest/StatusServiceTest.php
+++ b/tests/php/Unit/Service/SignRequest/StatusServiceTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Service\SignRequest;
+
 /**
  * SPDX-FileCopyrightText: 2026 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Service/SignatureBackgroundServiceTest.php b/tests/php/Unit/Service/SignatureBackgroundServiceTest.php
index 7046dde0f7..dd09116aeb 100644
--- a/tests/php/Unit/Service/SignatureBackgroundServiceTest.php
+++ b/tests/php/Unit/Service/SignatureBackgroundServiceTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Service;
+
 /**
  * SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Service/SignatureTextServiceTest.php b/tests/php/Unit/Service/SignatureTextServiceTest.php
index 2518e0db17..b8fd18c9e5 100644
--- a/tests/php/Unit/Service/SignatureTextServiceTest.php
+++ b/tests/php/Unit/Service/SignatureTextServiceTest.php
@@ -1,11 +1,15 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Service;
+
 /**
  * SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+use Imagick;
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Service\SignatureTextService;
 use OCP\IAppConfig;
diff --git a/tests/php/Unit/Service/SignerElementsServiceTest.php b/tests/php/Unit/Service/SignerElementsServiceTest.php
index 5b688e7ad7..9c6998ced2 100644
--- a/tests/php/Unit/Service/SignerElementsServiceTest.php
+++ b/tests/php/Unit/Service/SignerElementsServiceTest.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace OCA\Libresign\Tests\Unit\Service;
+
 /**
  * SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/php/Unit/Settings/AdminSettingsTest.php b/tests/php/Unit/Settings/AdminSettingsTest.php
index 71ccc18fb8..98aa22ae9f 100644
--- a/tests/php/Unit/Settings/AdminSettingsTest.php
+++ b/tests/php/Unit/Settings/AdminSettingsTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit\Service;
+namespace OCA\Libresign\Tests\Unit\Settings;
 
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Settings\AdminSettings;
diff --git a/tests/php/Unit/Settings/AdminTest.php b/tests/php/Unit/Settings/AdminTest.php
index 90b75a2461..baa10df387 100644
--- a/tests/php/Unit/Settings/AdminTest.php
+++ b/tests/php/Unit/Settings/AdminTest.php
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Tests\Unit\Service;
+namespace OCA\Libresign\Tests\Unit\Settings;
 
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Handler\CertificateEngine\CertificateEngineFactory;