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