diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index f8d2fe99de..e50a8634a9 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -13175,6 +13175,7 @@
       <code>DatabaseInterface::getInstance()</code>
       <code>DatabaseInterface::getInstance()</code>
       <code>DatabaseInterface::getInstance()</code>
+      <code>DatabaseInterface::getInstance()</code>
     </DeprecatedMethod>
     <MixedArgument>
       <code>$currentTable</code>
diff --git a/tests/classes/Controllers/Database/StructureControllerTest.php b/tests/classes/Controllers/Database/StructureControllerTest.php
index 88e7822fe4..cb3c1fa92b 100644
--- a/tests/classes/Controllers/Database/StructureControllerTest.php
+++ b/tests/classes/Controllers/Database/StructureControllerTest.php
@@ -8,7 +8,6 @@ use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\ConfigStorage\Relation;
 use PhpMyAdmin\Controllers\Database\StructureController;
-use PhpMyAdmin\Core;
 use PhpMyAdmin\Current;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\DbTableExists;
@@ -315,8 +314,17 @@ class StructureControllerTest extends AbstractTestCase
         Current::$database = 'testdb';
         Current::$table = 'mytable';
 
-        /** @var StructureController $structureController */
-        $structureController = Core::getContainerBuilder()->get(StructureController::class);
+        $dbi = DatabaseInterface::getInstance();
+        $structureController = new StructureController(
+            $this->response,
+            $this->template,
+            $this->relation,
+            $this->replication,
+            $dbi,
+            $this->createStub(TrackingChecker::class),
+            $this->createStub(PageSettings::class),
+            new DbTableExists($dbi),
+        );
 
         $this->assertSame(
             [[], '', '', 0],