diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 7ce1f1f1f5..463c8a0faa 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -6463,9 +6463,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
-    <InvalidArgument>
-      <code><![CDATA[$GLOBALS[$match]]]></code>
-    </InvalidArgument>
     <InvalidReturnStatement>
       <code><![CDATA[$GLOBALS[$name] ?? $name ?? '']]></code>
     </InvalidReturnStatement>
@@ -6490,6 +6487,7 @@
       <code><![CDATA[new $class()]]></code>
     </MixedMethodCall>
     <PossiblyInvalidArgument>
+      <code><![CDATA[$GLOBALS[$match]]]></code>
       <code><![CDATA[$_GET[$opt]]]></code>
       <code><![CDATA[$_REQUEST[$opt]]]></code>
       <code><![CDATA[$val]]></code>
diff --git a/psalm.xml b/psalm.xml
index db74a6aa69..28ea88cbb5 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -43,8 +43,6 @@
             buffer_needed: bool,
             cached_affected_rows: int|numeric-string,
             charset: string,
-            charset_connection: string,
-            collation_connection: string,
             complete_query: string,
             compression: 'none'|'zip'|'gzip',
             conn_error: string,
@@ -58,32 +56,21 @@
             error: bool,
             excel_edition: 'win'|'mac_excel2003'|'mac_excel2008',
             file_handle: resource|null,
-            finished: bool,
             from_cookie: bool,
             hostname: string,
-            import_file: string,
-            import_file_name: string,
             import_text: string,
             knjenc: string,
-            lang: string,
-            maximum_time: 0|positive-int,
             maxsize: string,
             memory_limit: int,
-            offset: int,
             old_tz: string,
             onfly_compression: bool,
             output_charset_conversion: bool,
             output_kanji_conversion: bool,
-            plugin_param: array{export_type: string, single_table: bool},
             plugin_scripts: string[],
             pma_auth_server: string,
-            PMA_PHP_SELF: string,
             querytime: float|int,
-            read_limit: int,
             save_on_server: bool,
             SESSION_KEY: string,
-            showtable: array&lt;string, string|null&gt;,
-            tbl_storage_engine: string,
             username: string
         }"/>
     </globals>
diff --git a/tests/unit/Controllers/Database/EventsControllerTest.php b/tests/unit/Controllers/Database/EventsControllerTest.php
index 56d883bfd2..b377e9d7bf 100644
--- a/tests/unit/Controllers/Database/EventsControllerTest.php
+++ b/tests/unit/Controllers/Database/EventsControllerTest.php
@@ -23,7 +23,6 @@ final class EventsControllerTest extends AbstractTestCase
     public function testWithEvents(): void
     {
         Current::$server = 2;
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         Current::$database = 'test_db';
         Config::getInstance()->selectedServer['DisableIS'] = true;
 
@@ -193,7 +192,6 @@ HTML;
     public function testWithoutEvents(): void
     {
         Current::$server = 2;
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         Current::$database = 'test_db';
         Config::getInstance()->selectedServer['DisableIS'] = true;
 
diff --git a/tests/unit/Controllers/Database/RoutinesControllerTest.php b/tests/unit/Controllers/Database/RoutinesControllerTest.php
index 5552ce2c1c..190f51b939 100644
--- a/tests/unit/Controllers/Database/RoutinesControllerTest.php
+++ b/tests/unit/Controllers/Database/RoutinesControllerTest.php
@@ -24,7 +24,6 @@ final class RoutinesControllerTest extends AbstractTestCase
     public function testWithRoutines(): void
     {
         Current::$server = 2;
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         Current::$database = 'test_db';
         Config::getInstance()->selectedServer['DisableIS'] = true;
 
@@ -246,7 +245,6 @@ HTML;
     public function testWithoutRoutines(): void
     {
         Current::$server = 2;
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         Current::$database = 'test_db';
         Config::getInstance()->selectedServer['DisableIS'] = true;
 
diff --git a/tests/unit/Controllers/GisDataEditorControllerTest.php b/tests/unit/Controllers/GisDataEditorControllerTest.php
index 50d0ad3573..3ce977ac30 100644
--- a/tests/unit/Controllers/GisDataEditorControllerTest.php
+++ b/tests/unit/Controllers/GisDataEditorControllerTest.php
@@ -23,7 +23,6 @@ class GisDataEditorControllerTest extends AbstractTestCase
     {
         parent::setUp();
 
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         Current::$database = 'db';
         Current::$table = 'table';
 
diff --git a/tests/unit/Controllers/Triggers/IndexControllerTest.php b/tests/unit/Controllers/Triggers/IndexControllerTest.php
index c56a29ae72..958d4c74ce 100644
--- a/tests/unit/Controllers/Triggers/IndexControllerTest.php
+++ b/tests/unit/Controllers/Triggers/IndexControllerTest.php
@@ -26,7 +26,6 @@ final class IndexControllerTest extends AbstractTestCase
     public function testWithTriggers(): void
     {
         Current::$server = 2;
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         Current::$database = 'test_db';
         Config::getInstance()->selectedServer['DisableIS'] = true;
 
@@ -161,7 +160,6 @@ HTML;
     public function testWithoutTriggers(): void
     {
         Current::$server = 2;
-        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         Current::$database = 'test_db';
         Config::getInstance()->selectedServer['DisableIS'] = true;