diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 07b48d759a..09db27f827 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -3160,9 +3160,8 @@
       <code>$isUpload</code>
       <code>$isUpload</code>
     </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="4">
+    <MixedArgumentTypeCoercion occurrences="3">
       <code>$GLOBALS['jsvkey']</code>
-      <code>$GLOBALS['urlParams']</code>
       <code>$row_id</code>
       <code>$row_id</code>
     </MixedArgumentTypeCoercion>
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index ce96e28c31..b0700c9d82 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -1107,10 +1107,11 @@ JS;
             $this->dbQuery('DROP DATABASE IF EXISTS `phpmyadmin`;');
         }
 
-        if (! $this->hasFailed()) {
-            $this->markTestAs('passed', '');
+        if ($this->hasFailed()) {
+            return;
         }
 
+        $this->markTestAs('passed', '');
         $this->sqlWindowHandle = null;
         $this->webDriver->quit();
     }