diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8af1eac2..f256ead6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,6 +18,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -75,6 +76,8 @@ jobs:
             typo3-version: '^13.4'
           - php-version: '8.4'
             typo3-version: '^13.4'
+          - php-version: '8.5'
+            typo3-version: '^13.4'
     steps:
       - uses: actions/checkout@v4
 
@@ -115,6 +118,9 @@ jobs:
       - name: Run Unit Tests PHP8.4
         run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-unit
 
+      - name: Run Unit Tests PHP8.5
+        run: nix-shell --arg phpVersion \"php85\" --pure --run project-test-unit
+
       - name: Run Functional Tests PHP8.2
         run: nix-shell --arg phpVersion \"php82\" --pure --run project-test-functional
 
@@ -124,6 +130,9 @@ jobs:
       - name: Run Functional Tests PHP8.4
         run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-functional
 
+      - name: Run Functional Tests PHP8.5
+        run: nix-shell --arg phpVersion \"php85\" --pure --run project-test-functional
+
   test-acceptance:
     runs-on: ubuntu-latest
     needs:
@@ -143,3 +152,6 @@ jobs:
 
       - name: Run Acceptance Tests PHP8.4
         run: nix-shell --arg phpVersion \"php84\" --pure --run project-test-acceptance
+
+      - name: Run Acceptance Tests PHP8.5
+        run: nix-shell --arg phpVersion \"php85\" --pure --run project-test-acceptance
diff --git a/Build/UnitTests.xml b/Build/UnitTests.xml
deleted file mode 100644
index c22a0a8c..00000000
--- a/Build/UnitTests.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
-         backupGlobals="true"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         bootstrap="../vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
-         cacheResult="false"
-         colors="true"
-         failOnDeprecation="true"
-         failOnWarning="true"
-         failOnRisky="true"
-         processIsolation="false"
-         requireCoverageMetadata="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
->
-  <coverage/>
-  <testsuites>
-    <testsuite name="Cart Products Extension">
-      <directory>../Tests/Unit/</directory>
-    </testsuite>
-  </testsuites>
-  <source>
-    <include>
-      <directory suffix=".php">../Classes/</directory>
-    </include>
-  </source>
-</phpunit>
diff --git a/Build/FunctionalTests.xml b/Build/phpunit.xml.dist
similarity index 84%
rename from Build/FunctionalTests.xml
rename to Build/phpunit.xml.dist
index b073db76..ec412cba 100644
--- a/Build/FunctionalTests.xml
+++ b/Build/phpunit.xml.dist
@@ -2,9 +2,12 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" bootstrap="../vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php" colors="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" beStrictAboutTestsThatDoNotTestAnything="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache" requireCoverageMetadata="false">
   <coverage/>
   <testsuites>
-    <testsuite name="Cart Products Extension">
+    <testsuite name="functional">
       <directory>../Tests/Functional/</directory>
     </testsuite>
+      <testsuite name="unit">
+          <directory>../Tests/Unit/</directory>
+      </testsuite>
   </testsuites>
   <source>
     <include>
diff --git a/Documentation/guides.xml b/Documentation/guides.xml
index 5cacb857..37808288 100644
--- a/Documentation/guides.xml
+++ b/Documentation/guides.xml
@@ -11,8 +11,8 @@
                interlink-shortcode="extcode/cart_products"
     />
     <project title="Cart Products"
-             release="7.2.0"
-             version="7.2"
+             release="7.3.0"
+             version="7.3"
              copyright="2018 - 2025"
     />
     <inventory id="t3tsref" url="https://docs.typo3.org/typo3cms/TyposcriptReference/"/>
diff --git a/README.md b/README.md
index de153982..f2461d18 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Sometimes minor versions also result in minor adjustments to own templates or co
 
 | Cart Products | TYPO3      | PHP       | Support/Development                  |
 |---------------|------------|-----------|--------------------------------------|
-| 7.x.x         | 13.2       | 8.2 - 8.4 | Features, Bugfixes, Security Updates |
+| 7.x.x         | 13.2       | 8.2 - 8.5 | Features, Bugfixes, Security Updates |
 | 6.x.x         | 12.4       | 8.1+      | Bugfixes, Security Updates           |
 | 5.x.x         | 12.4       | 8.1+      | Security Updates                     |
 | 4.x.x         | 10.4, 11.5 | 7.2+      | Security Updates                     |
diff --git a/composer.json b/composer.json
index f34362f5..b50ad326 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
         }
     },
     "require": {
-        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
+        "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
         "ext-pdo": "*",
         "extcode/cart": "^11.0",
         "typo3/cms-core": "^13.4",
@@ -79,10 +79,10 @@
             "find *.php Classes Configuration Tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l"
         ],
         "test:php:unit": [
-            "vendor/bin/phpunit -c Build/UnitTests.xml"
+            "vendor/bin/phpunit -c Build/phpunit.xml.dist --testsuite unit --display-warnings --display-deprecations --display-errors"
         ],
         "test:php:functional": [
-            "typo3DatabaseDriver=\"pdo_sqlite\" vendor/bin/phpunit -c Build/FunctionalTests.xml"
+            "typo3DatabaseDriver=\"pdo_sqlite\" vendor/bin/phpunit -c Build/phpunit.xml.dist --testsuite functional --display-warnings --display-deprecations --display-errors"
         ],
         "test:phpstan:analyse": [
             "vendor/bin/phpstan analyse -c Build/phpstan.neon --memory-limit 256M"
diff --git a/ext_emconf.php b/ext_emconf.php
index e3a1b7d6..ba781938 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -4,7 +4,7 @@
     'title' => 'Cart - Products',
     'description' => 'Shopping Cart(s) for TYPO3 - Products',
     'category' => 'plugin',
-    'version' => '7.2.0',
+    'version' => '7.3.0',
     'state' => 'stable',
     'author' => 'Daniel Gohlke',
     'author_email' => 'ext@extco.de',
diff --git a/shell.nix b/shell.nix
index f815dae6..90b90dd3 100644
--- a/shell.nix
+++ b/shell.nix
@@ -84,7 +84,7 @@ let
     ];
     text = ''
       project-install
-      ./vendor/bin/phpunit -c Build/UnitTests.xml --display-deprecations --display-warnings
+      ./vendor/bin/phpunit -c Build/phpunit.xml.dist --testsuite unit --display-warnings --display-deprecations --display-errors
     '';
   };
 
@@ -96,7 +96,19 @@ let
     ];
     text = ''
       project-install
-      ./vendor/bin/phpunit -c Build/FunctionalTests.xml --display-deprecations --display-warnings
+      ./vendor/bin/phpunit -c Build/phpunit.xml.dist --testsuite functional --display-warnings --display-deprecations --display-errors
+    '';
+  };
+
+  projectTestWithCoverage = pkgs.writeShellApplication {
+    name = "project-test-with-coverage";
+    runtimeInputs = [
+      php
+      projectInstall
+    ];
+    text = ''
+      project-install
+      XDEBUG_MODE=coverage ./vendor/bin/phpunit -c Build/phpunit.xml.dist --coverage-html=coverage_result
     '';
   };
 
@@ -133,13 +145,13 @@ in pkgs.mkShellNoCC {
     php
     composer
     projectInstall
-    projectPhpstan
     projectCgl
     projectCglFix
     projectLint
     projectPhpstan
     projectTestUnit
     projectTestFunctional
+    projectTestWithCoverage
     projectTestAcceptance
   ];