diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4aa2ee3e..9c6ea43c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Support for Redmine 6.0.x was added.
 - New class `Redmine\Http\HttpFactory` to create `Redmine\Http\Request` and `Redmine\Http\Response` instances.
 
 ### Changed
 
-- Behaviour-driven tests are run against Redmine 5.1.4, 5.0.10 and 4.2.10.
+- Behaviour-driven tests are run against Redmine 6.0.2, 5.1.4, 5.0.10.
 
 ### Deprecated
 
diff --git a/README.md b/README.md
index e1480c25..7b08a74c 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@ like [Guzzle](https://github.com/guzzle/guzzle) for handling http connections
 We support (and run tests against) the [latest supported Redmine versions](https://www.redmine.org/projects/redmine/wiki/Download#Versions-status-and-releases-policy)
 that receive security updates.
 
+- Redmine 6.0.x
 - Redmine 5.1.x
 - Redmine 5.0.x
 
diff --git a/composer.json b/composer.json
index 9e8cf539..abfc01db 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,8 @@
     "scripts": {
         "bdt": [
             "Composer\\Config::disableProcessTimeout",
-            "@behat --format=progress --suite=redmine_50104",
+            "@behat --format=progress --suite=redmine_60002",
+            "@behat --format=progress --suite=redmine_50105",
             "@behat --format=progress --suite=redmine_50010"
         ],
         "behat": "behat --config tests/Behat/behat.yml",
diff --git a/docker-compose.yml b/docker-compose.yml
index 53eadb7b..b30adf57 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,6 +26,19 @@ services:
     # Make sure the following services are configured in:
     # - /tests/Behat/behat.yml
 
+    redmine-60002:
+        image: redmine:6.0.2
+        ports:
+            - "6002:3000"
+        environment:
+            # Workaround: Remove secret for Rails 7.2 so it will be generated automatically
+            # @see https://github.com/docker-library/redmine/issues/349#issuecomment-2516634932
+            # REDMINE_SECRET_KEY_BASE: supersecretkey
+            REDMINE_PLUGINS_MIGRATE: true
+        volumes:
+            - ./.docker/redmine-60002_data/files:/usr/src/redmine/files
+            - ./.docker/redmine-60002_data/sqlite:/usr/src/redmine/sqlite
+
     redmine-50105:
         image: redmine:5.1.5
         user: "1000:1000"
diff --git a/tests/Behat/behat.yml b/tests/Behat/behat.yml
index 2ccd2c7b..f8b98022 100644
--- a/tests/Behat/behat.yml
+++ b/tests/Behat/behat.yml
@@ -1,5 +1,11 @@
 default:
     suites:
+        redmine_60002:
+            paths:
+                - '%paths.base%/features'
+            contexts:
+                - Redmine\Tests\Behat\Bootstrap\FeatureContext:
+                    redmineVersion: '6.0.2'
         redmine_50105:
             paths:
                 - '%paths.base%/features'