diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 597b6b45a8..2b3e6ea74c 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -14108,7 +14108,6 @@
   <file src="tests/classes/Export/OptionsTest.php">
     <DeprecatedMethod>
       <code>Config::getInstance()</code>
-      <code>DatabaseInterface::getInstance()</code>
     </DeprecatedMethod>
     <InvalidPropertyAssignmentValue>
       <code><![CDATA[$config->settings]]></code>
diff --git a/tests/classes/Export/OptionsTest.php b/tests/classes/Export/OptionsTest.php
index 007a57c277..04b73affec 100644
--- a/tests/classes/Export/OptionsTest.php
+++ b/tests/classes/Export/OptionsTest.php
@@ -65,8 +65,6 @@ class OptionsTest extends AbstractTestCase
         $table = 'PMA_test';
         $numTablesStr = '10';
         $unlimNumRowsStr = 'unlim_num_rows_str';
-        //$single_table = "single_table";
-        DatabaseInterface::getInstance()->getCache()->cacheTableContent([$db, $table, 'ENGINE'], 'MERGE');
 
         $columnsInfo = [
             'test_column1' => ['COLUMN_NAME' => 'test_column1'],
diff --git a/tests/classes/Table/TableTest.php b/tests/classes/Table/TableTest.php
index 2eb56d20fa..9f2a837e88 100644
--- a/tests/classes/Table/TableTest.php
+++ b/tests/classes/Table/TableTest.php
@@ -936,11 +936,6 @@ class TableTest extends AbstractTestCase
     public function testIsMergeCase1(): void
     {
         $dbi = DatabaseInterface::getInstance();
-        $tableObj = new Table('PMA_BookMark', 'PMA', $dbi);
-        $this->assertEquals(
-            '',
-            $tableObj->isMerge(),
-        );
 
         $tableObj = new Table('PMA_BookMark', 'PMA', $dbi);
         $this->assertFalse(