diff --git a/Modules/Test/classes/Setup/class.ilTestSetupAgent.php b/Modules/Test/classes/Setup/class.ilTestSetupAgent.php
index 1f15f3403def..138c095d7862 100644
--- a/Modules/Test/classes/Setup/class.ilTestSetupAgent.php
+++ b/Modules/Test/classes/Setup/class.ilTestSetupAgent.php
@@ -26,6 +26,7 @@
 use ILIAS\Refinery\Transformation;
 use ILIAS\Test\Setup\ilManScoringSettingsToOwnDbTableMigration;
 use ILIAS\Test\Setup\ilRemoveDynamicTestsAndCorrespondingDataMigration;
+use ILIAS\Test\Setup\ilSeparateQuestionListSettingMigration;
 
 class ilTestSetupAgent extends NullAgent
 {
@@ -65,7 +66,8 @@ public function getMigrations(): array
     {
         return [
             new ilManScoringSettingsToOwnDbTableMigration(),
-            new ilRemoveDynamicTestsAndCorrespondingDataMigration()
+            new ilRemoveDynamicTestsAndCorrespondingDataMigration(),
+            new ilSeparateQuestionListSettingMigration()
         ];
     }
 }
diff --git a/Modules/Test/classes/Setup/ilSeparateQuestionListSettingMigration.php b/Modules/Test/classes/Setup/ilSeparateQuestionListSettingMigration.php
new file mode 100644
index 000000000000..e0a8bd94de14
--- /dev/null
+++ b/Modules/Test/classes/Setup/ilSeparateQuestionListSettingMigration.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Test\Setup;
+
+use ILIAS\Setup;
+use ILIAS\Setup\Environment;
+use ilDatabaseInitializedObjective;
+use ilDatabaseUpdatedObjective;
+use ilDBInterface;
+use Exception;
+use ILIAS\Setup\CLI\IOWrapper;
+
+class ilSeparateQuestionListSettingMigration implements Setup\Migration
+{
+    private const DEFAULT_AMOUNT_OF_STEPS = 1;
+    private ilDBInterface $db;
+
+    /**
+     * @var IOWrapper
+     */
+    private mixed $io;
+
+    public function getLabel(): string
+    {
+        return "Update QuestionList Settings";
+    }
+
+    public function getDefaultAmountOfStepsPerRun(): int
+    {
+        return self::DEFAULT_AMOUNT_OF_STEPS;
+    }
+
+    public function getPreconditions(Environment $environment): array
+    {
+        return [
+            new ilDatabaseInitializedObjective(),
+            new ilDatabaseUpdatedObjective()
+        ];
+    }
+
+    public function prepare(Environment $environment): void
+    {
+        $this->db = $environment->getResource(Setup\Environment::RESOURCE_DATABASE);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function step(Environment $environment): void
+    {
+        $this->db->manipulate(
+            'UPDATE tst_tests SET show_questionlist = 1 WHERE show_summary > 0'
+        );
+
+        $this->db->manipulate(
+            'UPDATE tst_tests SET show_questionlist = 0 WHERE show_summary = 0'
+        );
+    }
+
+    public function getRemainingAmountOfSteps(): int
+    {
+        $result = $this->db->query(
+            "SELECT count(*) as cnt FROM tst_tests WHERE show_questionlist is NULL"
+        );
+        $row = $this->db->fetchAssoc($result);
+
+        return (int) $row['cnt'] ?? 0;
+    }
+}