diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php
index 90156d1c7b..ea42e4778f 100644
--- a/libraries/classes/Controllers/Server/DatabasesController.php
+++ b/libraries/classes/Controllers/Server/DatabasesController.php
@@ -394,7 +394,7 @@ class DatabasesController extends AbstractController
                     $database['SCHEMA_NAME'],
                     true
                 ),
-                'is_pmadb' => $database['SCHEMA_NAME'] === $cfg['Server']['pmadb'],
+                'is_pmadb' => $database['SCHEMA_NAME'] === ($cfg['Server']['pmadb'] ?? ''),
                 'url' => $url,
             ];
             $collation = Charsets::findCollationByName(
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 90223a1a2a..492f2a5df0 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,11 +9,6 @@
         <testsuite name="Classes">
             <directory suffix="Test.php">test/classes</directory>
         </testsuite>
-        <testsuite name="Unit">
-            <file>test/classes/EnvironmentTest.php</file>
-            <directory suffix="Test.php">test/libraries/common</directory>
-            <directory suffix="Test.php">test/libraries</directory>
-        </testsuite>
         <testsuite name="Selenium">
             <directory suffix="Test.php">test/selenium</directory>
         </testsuite>
diff --git a/phpunit.xml.nocoverage b/phpunit.xml.nocoverage
index f1a4085749..b275f1cfcf 100644
--- a/phpunit.xml.nocoverage
+++ b/phpunit.xml.nocoverage
@@ -9,11 +9,6 @@
         <testsuite name="Classes">
             <directory suffix="Test.php">test/classes</directory>
         </testsuite>
-        <testsuite name="Unit">
-            <file>test/classes/EnvironmentTest.php</file>
-            <directory suffix="Test.php">test/libraries/common</directory>
-            <directory suffix="Test.php">test/libraries</directory>
-        </testsuite>
         <testsuite name="Selenium">
             <directory suffix="Test.php">test/selenium</directory>
         </testsuite>