diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 301798cec..f335cab1e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,26 +1,26 @@
 <?php
 
-use PHPUnit\Framework\TestCase;
+declare(strict_types=1);
 
 /**
- * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  *
  */
+
+use OCP\App\IAppManager;
+use OCP\Server;
+use PHPUnit\Framework\TestCase;
+
 if (!defined('PHPUNIT_RUN')) {
 	define('PHPUNIT_RUN', 1);
 }
 
 require_once __DIR__ . '/../../../lib/base.php';
-
-// Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
-
-// Fix for "Autoload path not allowed: .../photos/tests/testcase.php"
-\OC_App::loadApp('photos');
+require_once __DIR__ . '/../../../tests/autoload.php';
 
 if (!class_exists(TestCase::class)) {
 	require_once('PHPUnit/Autoload.php');
 }
 
-OC_Hook::clear();
+Server::get(IAppManager::class)->loadApp('photos');