diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index cc77f41958..62e4c06988 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -863,11 +863,6 @@
       <code>Config::getInstance()</code>
     </DeprecatedMethod>
   </file>
-  <file src="src/Controllers/ColumnController.php">
-    <PossiblyUnusedMethod>
-      <code>__construct</code>
-    </PossiblyUnusedMethod>
-  </file>
   <file src="src/Controllers/Config/GetConfigController.php">
     <PossiblyUnusedMethod>
       <code>__construct</code>
diff --git a/tests/classes/Controllers/ColumnControllerTest.php b/tests/classes/Controllers/ColumnControllerTest.php
new file mode 100644
index 0000000000..f6828828ef
--- /dev/null
+++ b/tests/classes/Controllers/ColumnControllerTest.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Tests\Controllers;
+
+use PhpMyAdmin\Config;
+use PhpMyAdmin\Controllers\ColumnController;
+use PhpMyAdmin\Http\Factory\ServerRequestFactory;
+use PhpMyAdmin\Message;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Tests\AbstractTestCase;
+use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
+use PHPUnit\Framework\Attributes\CoversClass;
+
+#[CoversClass(ColumnController::class)]
+final class ColumnControllerTest extends AbstractTestCase
+{
+    public function testColumnController(): void
+    {
+        $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/')
+            ->withParsedBody(['db' => 'test_db', 'table' => 'test_table']);
+
+        $dbi = $this->createDatabaseInterface();
+        $responseRenderer = new ResponseRenderer();
+        $controller = new ColumnController($responseRenderer, new Template(new Config()), $dbi);
+        $controller($request);
+
+        self::assertTrue($responseRenderer->hasSuccessState());
+        self::assertSame('', $responseRenderer->getHTMLResult());
+        self::assertSame(['columns' => ['id', 'name', 'datetimefield']], $responseRenderer->getJSONResult());
+    }
+
+    public function testWithMissingParameters(): void
+    {
+        $request = ServerRequestFactory::create()->createServerRequest('GET', 'http://example.com/');
+
+        $dbi = $this->createDatabaseInterface();
+        $responseRenderer = new ResponseRenderer();
+        $controller = new ColumnController($responseRenderer, new Template(new Config()), $dbi);
+        $controller($request);
+
+        self::assertFalse($responseRenderer->hasSuccessState());
+        self::assertSame('', $responseRenderer->getHTMLResult());
+        self::assertSame(['message' => Message::error()->getDisplay()], $responseRenderer->getJSONResult());
+    }
+}