diff --git a/lib/bootstrap-definitions.php b/lib/bootstrap-definitions.php
index 8afb8ce5fbc49f2d74b14c33802e21998d61846d..e3bf88ac4a07f38dcce11be170550507fd2cf565 100644
--- a/lib/bootstrap-definitions.php
+++ b/lib/bootstrap-definitions.php
@@ -67,4 +67,5 @@ return [
 
         return $pdo;
     }),
+    PluginManager::class => DI\factory([PluginManager::class, 'getInstance']),
 ];
diff --git a/lib/plugins/engine/PluginManager.class.php b/lib/plugins/engine/PluginManager.class.php
index fc81d7f36efef9ee632b2375136a9d0a481df080..7e36fa0ae4ae7ef0b4d185985dbb81d0568b8a51 100644
--- a/lib/plugins/engine/PluginManager.class.php
+++ b/lib/plugins/engine/PluginManager.class.php
@@ -591,7 +591,7 @@ class PluginManager
         }
 
         if ($plugin_class) {
-            $plugin = $plugin_class->newInstance();
+            $plugin = app()->get($class);
         }
 
         return $this->plugin_cache[$class] = $plugin;
diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php
index 1745a1a0b7db55138af6270c4ae14c82fd51dcfc..322883d9a63064b4fdcb05ef495ac2822c9ccb4e 100644
--- a/tests/functional/_bootstrap.php
+++ b/tests/functional/_bootstrap.php
@@ -19,6 +19,7 @@ $inc_path .= PATH_SEPARATOR . __DIR__ . '/../../config';
 ini_set('include_path', $inc_path);
 
 require 'lib/classes/StudipAutoloader.php';
+require 'lib/helpers.php';
 require 'lib/functions.php';
 require_once 'lib/language.inc.php';
 require 'lib/visual.inc.php';
diff --git a/tests/jsonapi/_bootstrap.php b/tests/jsonapi/_bootstrap.php
index dea1c813910a6ac5f9aaceb86dbbcd0298df35c0..7987b34e91d883d9814cd7f2edf5b678ee81f9ff 100644
--- a/tests/jsonapi/_bootstrap.php
+++ b/tests/jsonapi/_bootstrap.php
@@ -29,6 +29,7 @@ date_default_timezone_set('Europe/Berlin');
 
 require 'config.inc.php';
 
+require 'lib/helpers.php';
 require 'lib/functions.php';
 require 'lib/language.inc.php';
 require 'lib/visual.inc.php';