diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 3deba9cd8c..0c4c6bd85c 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -453,9 +453,6 @@
     <PossiblyNullIterator occurrences="1">
       <code>$this-&gt;config-&gt;getServers()</code>
     </PossiblyNullIterator>
-    <TypeDoesNotContainType occurrences="1">
-      <code>PMA_IS_WINDOWS</code>
-    </TypeDoesNotContainType>
   </file>
   <file src="libraries/classes/Controllers/Table/ChangeController.php">
     <TypeDoesNotContainType occurrences="1">
diff --git a/test/classes/OpenDocumentTest.php b/test/classes/OpenDocumentTest.php
index a5016d00fc..3a12546aea 100644
--- a/test/classes/OpenDocumentTest.php
+++ b/test/classes/OpenDocumentTest.php
@@ -26,7 +26,8 @@ class OpenDocumentTest extends AbstractTestCase
         );
         $this->assertNotFalse($document);
 
-        $tmpFile = (string) tempnam('./', 'open-document-test');
+        $tmpFile = tempnam('./', 'open-document-test');
+        $this->assertNotFalse($tmpFile);
         $this->assertNotFalse(file_put_contents($tmpFile, $document), 'The temp file should be written');
 
         $zipExtension = new ZipExtension(new ZipArchive());
@@ -48,6 +49,8 @@ class OpenDocumentTest extends AbstractTestCase
         );
 
         $this->assertSame(5, $zipExtension->getNumberOfFiles($tmpFile));
+        // Unset to close any file that were left open.
+        unset($zipExtension);
         $this->assertTrue(unlink($tmpFile));
     }
 }