diff --git a/modules/admin/lib/Controller/Federation.php b/modules/admin/lib/Controller/Federation.php
index b0cdef7bd96d54ec553e8a4d72db48cccc5b9e99..d45d0f2f7bc511974fe38c82b81a5717088301db 100644
--- a/modules/admin/lib/Controller/Federation.php
+++ b/modules/admin/lib/Controller/Federation.php
@@ -415,6 +415,7 @@ class Federation
                 $error = $e->getMessage();
             }
 
+            $output = [];
             if ($entities !== null) {
                 // get all metadata for the entities
                 foreach ($entities as &$entity) {
diff --git a/tests/modules/admin/lib/Controller/ConfigTest.php b/tests/modules/admin/lib/Controller/ConfigTest.php
index 8685e4c9cfabeee927dd55aff585648809ce660f..67611e0f6da9d377e175373a9fca76f71ea93576 100644
--- a/tests/modules/admin/lib/Controller/ConfigTest.php
+++ b/tests/modules/admin/lib/Controller/ConfigTest.php
@@ -81,6 +81,7 @@ class ConfigTest extends TestCase
      */
     public function testDiagnostics(): void
     {
+        $_SERVER['REQUEST_URI'] = '/module.php/admin/diagnostics';
         $request = Request::create(
             '/diagnostics',
             'GET'
@@ -99,6 +100,7 @@ class ConfigTest extends TestCase
      */
     public function testMain(): void
     {
+        $_SERVER['REQUEST_URI'] = '/module.php/admin';
         $request = Request::create(
             '/',
             'GET'
@@ -117,6 +119,7 @@ class ConfigTest extends TestCase
      */
     public function testPhpinfo(): void
     {
+        $_SERVER['REQUEST_URI'] = '/module.php/admin/phpinfo';
         $request = Request::create(
             '/phpinfo',
             'GET'
diff --git a/tests/modules/admin/lib/Controller/TestTest.php b/tests/modules/admin/lib/Controller/TestTest.php
index a74fa83199efec54bfd837a01e502fe7b405ca21..b509f78c404b3b5a013081e3401ecd3ef4a1d86d 100644
--- a/tests/modules/admin/lib/Controller/TestTest.php
+++ b/tests/modules/admin/lib/Controller/TestTest.php
@@ -78,6 +78,7 @@ class TestTest extends TestCase
      */
     public function testMainWithoutAuthSource(): void
     {
+        $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
         $request = Request::create(
             '/test',
             'GET'
@@ -97,6 +98,7 @@ class TestTest extends TestCase
      */
     public function testMainWithAuthSourceAndLogout(): void
     {
+        $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
         $request = Request::create(
             '/test',
             'GET',
@@ -124,6 +126,7 @@ class TestTest extends TestCase
      */
     public function testMainWithAuthSourceAndException(): void
     {
+        $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
         $request = Request::create(
             '/test',
             'GET',
@@ -150,6 +153,7 @@ class TestTest extends TestCase
      */
     public function testMainWithAuthSourceNotAuthenticated(): void
     {
+        $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
         $request = Request::create(
             '/test',
             'GET',
@@ -182,6 +186,7 @@ class TestTest extends TestCase
      */
     public function testMainWithAuthSourceAuthenticated(): void
     {
+        $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
         $request = Request::create(
             '/test',
             'GET'