diff --git a/.ddev/config.yaml b/.ddev/config.yaml
index 3209c1d..114b170 100644
--- a/.ddev/config.yaml
+++ b/.ddev/config.yaml
@@ -1,7 +1,7 @@
 name: mail-logger
 type: typo3
 docroot: public
-php_version: "8.3"
+php_version: "8.5"
 webserver_type: nginx-fpm
 xdebug_enabled: false
 additional_hostnames: []
diff --git a/.github/workflows/tasks.yml b/.github/workflows/tasks.yml
index 650a363..0623a43 100644
--- a/.github/workflows/tasks.yml
+++ b/.github/workflows/tasks.yml
@@ -9,8 +9,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [  '8.3', '8.4' ]
+        php: [  '8.3', '8.4', '8.5' ]
         typo3: [ '12', '13' ]
+        exclude:
+          - php: '8.5'
+            typo3: '12'
     steps:
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2
@@ -52,7 +55,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           extensions: intl, mbstring, xml, soap, zip, curl
 
       - name: Install typo3/tailor
diff --git a/Classes/Command/TestMailCommand.php b/Classes/Command/TestMailCommand.php
index 3d8b6da..d0b7a71 100644
--- a/Classes/Command/TestMailCommand.php
+++ b/Classes/Command/TestMailCommand.php
@@ -39,7 +39,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $args = $input->getArguments();
         if ($args['templatekey'] !== '') {
-            $mail = MailUtility::getMailByKey($args['templatekey'], null);
+            $mail = MailUtility::getMailByKey($args['templatekey']);
         } else {
             $mail = GeneralUtility::makeInstance(MailMessage::class);
             $mail
diff --git a/composer.json b/composer.json
index d142d61..3002ad7 100644
--- a/composer.json
+++ b/composer.json
@@ -10,20 +10,20 @@
     "docs": "https://github.com/andersundsehr/mail_logger/blob/master/README.md"
   },
   "require": {
-    "php": "~8.3.0 || ~8.4.0",
+    "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
     "composer-runtime-api": "^2",
     "typo3/cms-core": "^12.4.0 || ^13.4.0"
   },
   "require-dev": {
     "ext-json": "*",
-    "andersundsehr/no-ci": "^1.0",
-    "helhum/typo3-console": "^8.2.2",
-    "phpunit/phpunit": "^10.5.54",
-    "pluswerk/grumphp-config": "^7.2.0 || ^10.1.3",
+    "andersundsehr/no-ci": "^1.1",
+    "helhum/typo3-console": "^8.2.3",
+    "phpunit/phpunit": "^10.5.59",
+    "pluswerk/grumphp-config": "^7.2.0 || ^10.2.2",
     "saschaegerer/phpstan-typo3": "^1.10.2 || ^2.1.1",
-    "spatie/phpunit-snapshot-assertions": "^5.2.2",
-    "ssch/typo3-rector": "^2.15.2 || ^3.6.2",
-    "typo3/testing-framework": "^8.2.7 || ^9.2.0"
+    "spatie/phpunit-snapshot-assertions": "^5.2.3",
+    "ssch/typo3-rector": "^2.15.2 || ^3.9.0",
+    "typo3/testing-framework": "^8.3.1 || ^9.2.0"
   },
   "replace": {
     "pluswerk/mail_logger": "self.version",