diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index dfbe068..0aef013 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -121,6 +121,12 @@ jobs:
           - db-version: '8'
             php-version: '8.2'
             typo3-version: '^11.5'
+          - db-version: '8'
+            php-version: '8.1'
+            typo3-version: '^12.4'
+          - db-version: '8'
+            php-version: '8.2'
+            typo3-version: '^12.4'
     steps:
       - uses: actions/checkout@v3
 
@@ -177,6 +183,10 @@ jobs:
             typo3-version: '^11.5'
           - php-version: '8.2'
             typo3-version: '^11.5'
+          - php-version: '8.1'
+            typo3-version: '^12.4'
+          - php-version: '8.2'
+            typo3-version: '^12.4'
     steps:
       - uses: actions/checkout@v3
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52e7bc8..ea87e62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Upcoming
+
+### Added
+
+- Add Support for TYPO3 v12.4.
+
 ## v1.2.0 - 2023-05-04
 
 ### Added
diff --git a/Classes/TestingFramework.php b/Classes/TestingFramework.php
index cd8a7b7..5eef4a9 100644
--- a/Classes/TestingFramework.php
+++ b/Classes/TestingFramework.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace Codappix\Typo3PhpDatasets;
 
-use Doctrine\DBAL\DBALException;
+use Exception;
 use InvalidArgumentException;
 
 /**
@@ -38,8 +38,8 @@ trait TestingFramework
         $dataSet = include $filePath;
         try {
             (new PhpDataSet())->import($dataSet);
-        } catch (DBALException $e) {
-            self::fail('SQL Error for PHP data-set "' . $filePath . '":' . PHP_EOL . $e->getMessage());
+        } catch (Exception $e) {
+            self::fail('Error for PHP data-set "' . $filePath . '":' . PHP_EOL . $e->getMessage());
         }
     }
 
diff --git a/Tests/Functional/ImportTest.php b/Tests/Functional/ImportTest.php
index 59cf918..3a4b8fc 100644
--- a/Tests/Functional/ImportTest.php
+++ b/Tests/Functional/ImportTest.php
@@ -79,10 +79,10 @@ class ImportTest extends AbstractFunctionalTestCase
     public function failsIfSqlError(): void
     {
         $this->expectException(AssertionFailedError::class);
-        $this->expectExceptionMessage(
-            'SQL Error for PHP data-set "' . __DIR__ . '/Fixtures/WithBrokenSql.php":'
+        $this->expectExceptionMessageMatches(
+            '#Error for PHP data-set "' . __DIR__ . '/Fixtures/WithBrokenSql.php":'
             . PHP_EOL
-            . 'There is no column with name \'none_existing_column\' on table \'pages\'.'
+            . 'There is no column with name .*none_existing_column.* on table .*pages.*\.#'
         );
         $this->importPHPDataSet(__DIR__ . '/Fixtures/WithBrokenSql.php');
     }
diff --git a/composer.json b/composer.json
index 69b7d8b..7c62a45 100644
--- a/composer.json
+++ b/composer.json
@@ -25,16 +25,16 @@
     "require": {
         "php": "^7.2 || ^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2",
         "composer-runtime-api": "^2.2",
-        "doctrine/dbal": "^2.13",
-        "symfony/console": "^5.4",
-        "typo3/cms-core": "^10.4 || ^11.5"
+        "doctrine/dbal": "^2.13 || ^3.6",
+        "symfony/console": "^5.4 || ^6.2",
+        "typo3/cms-core": "^10.4 || ^11.5 || ^12.4"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpunit/phpunit": "^8.5 || ^9.6",
-        "typo3/testing-framework": "^6.16"
+        "typo3/testing-framework": "^6.16 || ^7.0"
     },
     "extra": {
         "typo3/cms": {
diff --git a/phpstan.neon b/phpstan.neon
index a97e54c..88cf47b 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -6,5 +6,5 @@ parameters:
         - Classes
         - Tests
     checkMissingIterableValueType: false
-    reportUnmatchedIgnoredErrors: true
+    reportUnmatchedIgnoredErrors: false
     checkGenericClassInNonGenericObjectType: false