diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeApp.php b/lib/SP/Domain/Upgrade/Services/UpgradeApp.php
index 0200d81f..52d3c092 100644
--- a/lib/SP/Domain/Upgrade/Services/UpgradeApp.php
+++ b/lib/SP/Domain/Upgrade/Services/UpgradeApp.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 /*
  * sysPass
@@ -25,10 +26,6 @@ declare(strict_types=1);
 
 namespace SP\Domain\Upgrade\Services;
 
-use Exception;
-
-use function SP\processException;
-
 /**
  * Class UpgradeApp
  */
@@ -41,13 +38,7 @@ final class UpgradeApp extends UpgradeBase
 
     protected function applyUpgrade(string $version): bool
     {
-        try {
-            return true;
-        } catch (Exception $e) {
-            processException($e);
-        }
-
-        return false;
+        return true;
     }
 
     protected function commitVersion(string $version): void
diff --git a/tests/SP/Domain/Upgrade/Services/UpgradeAppTest.php b/tests/SP/Domain/Upgrade/Services/UpgradeAppTest.php
new file mode 100644
index 00000000..191b95f5
--- /dev/null
+++ b/tests/SP/Domain/Upgrade/Services/UpgradeAppTest.php
@@ -0,0 +1,87 @@
+<?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/>.
+ */
+
+declare(strict_types=1);
+
+/**
+ * sysPass
+ *
+ * @author    nuxsmin
+ * @link      http://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 SP\Tests\Domain\Upgrade\Services;
+
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\MockObject\Exception;
+use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Log\Ports\FileHandlerProvider;
+use SP\Domain\Upgrade\Services\UpgradeApp;
+use SP\Domain\Upgrade\Services\UpgradeException;
+use SP\Infrastructure\File\FileException;
+use SP\Tests\UnitaryTestCase;
+
+/**
+ * Class UpgradeAppTest
+ */
+#[Group('unitary')]
+class UpgradeAppTest extends UnitaryTestCase
+{
+    /**
+     * @throws Exception
+     * @throws UpgradeException
+     * @throws FileException
+     */
+    public function testUpgrade()
+    {
+        $fileHandlerProvider = $this->createMock(FileHandlerProvider::class);
+        $configData = $this->createMock(ConfigDataInterface::class);
+
+        $configData->expects($this->never())
+                   ->method('setAppVersion');
+
+        $this->config->expects($this->never())
+                     ->method('save');
+
+        $upgradeApp = new UpgradeApp($this->application, $fileHandlerProvider);
+        $upgradeApp->upgrade('123', $configData);
+    }
+}
diff --git a/tests/SP/Domain/Upgrade/Services/UpgradeConfigTest.php b/tests/SP/Domain/Upgrade/Services/UpgradeConfigTest.php
new file mode 100644
index 00000000..b23c7557
--- /dev/null
+++ b/tests/SP/Domain/Upgrade/Services/UpgradeConfigTest.php
@@ -0,0 +1,87 @@
+<?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/>.
+ */
+
+declare(strict_types=1);
+
+/**
+ * sysPass
+ *
+ * @author    nuxsmin
+ * @link      http://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 SP\Tests\Domain\Upgrade\Services;
+
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\MockObject\Exception;
+use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Log\Ports\FileHandlerProvider;
+use SP\Domain\Upgrade\Services\UpgradeConfig;
+use SP\Domain\Upgrade\Services\UpgradeException;
+use SP\Infrastructure\File\FileException;
+use SP\Tests\UnitaryTestCase;
+
+/**
+ * Class UpgradeConfigTest
+ */
+#[Group('unitary')]
+class UpgradeConfigTest extends UnitaryTestCase
+{
+    /**
+     * @throws Exception
+     * @throws UpgradeException
+     * @throws FileException
+     */
+    public function testUpgrade()
+    {
+        $fileHandlerProvider = $this->createMock(FileHandlerProvider::class);
+        $configData = $this->createMock(ConfigDataInterface::class);
+
+        $configData->expects($this->never())
+                   ->method('setConfigVersion');
+
+        $this->config->expects($this->never())
+                     ->method('save');
+
+        $upgradeConfig = new UpgradeConfig($this->application, $fileHandlerProvider);
+        $upgradeConfig->upgrade('123', $configData);
+    }
+}