diff --git a/job_creator.php b/job_creator.php
index 8db418a..c78e067 100644
--- a/job_creator.php
+++ b/job_creator.php
@@ -528,8 +528,9 @@ private function buildDynamicMatrix(
                 }
                 $matrix['include'][] = $job;
                 if (!$simpleMatrix && !$composerInstall) {
+                    $db = $cmsMajor == 5 ? DB_MYSQL_80 : DB_MYSQL_84;
                     $matrix['include'][] = $this->createJob(3, [
-                        'db' => DB_MYSQL_80,
+                        'db' => $db,
                         'endtoend' => true,
                         'endtoend_suite' => 'root',
                         'endtoend_tags' => $jobTag,
diff --git a/tests/JobCreatorTest.php b/tests/JobCreatorTest.php
index 7487105..2a51cd7 100644
--- a/tests/JobCreatorTest.php
+++ b/tests/JobCreatorTest.php
@@ -258,7 +258,7 @@ public function testCreateJson(
     public function provideCreateJson(): array
     {
         return [
-            // behat without @job1/@job2 test
+            // behat without @job1/@job2 test - cms 5
             [
                 implode("\n", [
                     $this->getGenericYml(),
@@ -394,6 +394,122 @@ public function provideCreateJson(): array
                     ],
                 ]
             ],
+            // behat without @job1/@job2 test - cms 6
+            [
+                implode("\n", [
+                    $this->getGenericYml(),
+                    <<<EOT
+                    github_repository: 'myaccount/silverstripe-framework'
+                    github_my_ref: '6'
+                    parent_branch: ''
+                    EOT
+                ]),
+                true,
+                false,
+                false,
+                [
+                    [
+                        'installer_version' => '6.x-dev',
+                        'php' => '8.3',
+                        'db' => DB_MARIADB,
+                        'composer_require_extra' => '',
+                        'composer_args' => '--prefer-lowest',
+                        'name_suffix' => '',
+                        'phpunit' => 'true',
+                        'phpunit_suite' => 'all',
+                        'phplinting' => 'false',
+                        'phpcoverage' => 'false',
+                        'endtoend' => 'false',
+                        'endtoend_suite' => 'root',
+                        'endtoend_config' => '',
+                        'endtoend_tags' => '',
+                        'js' => 'false',
+                        'doclinting' => 'false',
+                        'needs_full_setup' => 'true',
+                        'name' => '8.3 prf-low mariadb phpunit all',
+                    ],
+                    [
+                        'installer_version' => '6.x-dev',
+                        'php' => '8.3',
+                        'db' => DB_MYSQL_80,
+                        'composer_require_extra' => '',
+                        'composer_args' => '',
+                        'name_suffix' => '',
+                        'phpunit' => 'true',
+                        'phpunit_suite' => 'all',
+                        'phplinting' => 'false',
+                        'phpcoverage' => 'false',
+                        'endtoend' => 'false',
+                        'endtoend_suite' => 'root',
+                        'endtoend_config' => '',
+                        'endtoend_tags' => '',
+                        'js' => 'false',
+                        'doclinting' => 'false',
+                        'needs_full_setup' => 'true',
+                        'name' => '8.3 mysql80 phpunit all',
+                    ],
+                    [
+                        'installer_version' => '6.x-dev',
+                        'php' => '8.4',
+                        'db' => DB_MYSQL_84,
+                        'composer_require_extra' => '',
+                        'composer_args' => '',
+                        'name_suffix' => '',
+                        'phpunit' => 'true',
+                        'phpunit_suite' => 'all',
+                        'phplinting' => 'false',
+                        'phpcoverage' => 'false',
+                        'endtoend' => 'false',
+                        'endtoend_suite' => 'root',
+                        'endtoend_config' => '',
+                        'endtoend_tags' => '',
+                        'js' => 'false',
+                        'doclinting' => 'false',
+                        'needs_full_setup' => 'true',
+                        'name' => '8.4 mysql84 phpunit all',
+                    ],
+                    [
+                        'installer_version' => '6.x-dev',
+                        'php' => '8.3',
+                        'db' => DB_MYSQL_80,
+                        'composer_require_extra' => '',
+                        'composer_args' => '',
+                        'name_suffix' => '',
+                        'phpunit' => 'false',
+                        'phpunit_suite' => 'all',
+                        'phplinting' => 'false',
+                        'phpcoverage' => 'false',
+                        'endtoend' => 'true',
+                        'endtoend_suite' => 'root',
+                        'endtoend_config' => '',
+                        'endtoend_tags' => '',
+                        'js' => 'false',
+                        'doclinting' => 'false',
+                        'needs_full_setup' => 'true',
+                        'name' => '8.3 mysql80 endtoend root',
+                    ],
+                    [
+                        'installer_version' => '6.x-dev',
+                        'php' => '8.4',
+                        'db' => DB_MYSQL_84,
+                        'composer_require_extra' => '',
+                        'composer_args' => '',
+                        'name_suffix' => '',
+                        'phpunit' => 'false',
+                        'phpunit_suite' => 'all',
+                        'phplinting' => 'false',
+                        'phpcoverage' => 'false',
+                        'endtoend' => 'true',
+                        'endtoend_suite' => 'root',
+                        'endtoend_config' => '',
+                        'endtoend_tags' => '',
+                        'js' => 'false',
+                        'doclinting' => 'false',
+                        'needs_full_setup' => 'true',
+                        'name' => '8.4 mysql84 endtoend root',
+                    ],
+                ]
+            ],
             // behat with @job1/@job2 test
             [
                 implode("\n", [