diff --git a/CHANGELOG.md b/CHANGELOG.md
index 961e6e1e..7bea9d6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased](https://github.com/kbsali/php-redmine-api/compare/v2.8.0...v2.x)
 
+### Added
+
+- Add support for PHP 8.5
+- Add support for Redmine 6.1.
+
 ### Changed
 
-- Behaviour-driven tests are run against Redmine 6.0.7, 5.1.10, 5.0.14.
+- Behaviour-driven tests are run against Redmine 6.1.0, 6.0.7, 5.1.10.
+
+### Removed
+
+- Drop support for Redmine 5.0.x.
 
 ## [v2.8.0](https://github.com/kbsali/php-redmine-api/compare/v2.7.0...v2.8.0) - 2025-05-30
 
diff --git a/README.md b/README.md
index 7b08a74c..1d003ef0 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,9 @@ 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.1.x
 - Redmine 6.0.x
 - Redmine 5.1.x
-- Redmine 5.0.x
 
 Nevertheless, you can also use this library for all older Redmine versions.
 In this case, however, be aware that some features might not be supported by your Redmine server.
diff --git a/composer.json b/composer.json
index dcf4b537..6f2a63c5 100644
--- a/composer.json
+++ b/composer.json
@@ -53,9 +53,9 @@
     "scripts": {
         "bdt": [
             "Composer\\Config::disableProcessTimeout",
+            "@behat --format=progress --suite=redmine_6_1",
             "@behat --format=progress --suite=redmine_6_0",
-            "@behat --format=progress --suite=redmine_5_1",
-            "@behat --format=progress --suite=redmine_5_0"
+            "@behat --format=progress --suite=redmine_5_1"
         ],
         "behat": "behat --config tests/Behat/behat.yml",
         "codestyle": "php-cs-fixer fix",
diff --git a/docker-compose.yml b/docker-compose.yml
index 7122596b..8b11af78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
             - ./:/var/www/project/ # Location of the project for php-fpm. Note this should be the same for NGINX.*
 
     redmine-dev:
-        image: redmine:6.0.7
+        image: redmine:6.1.0
         ports:
             - "3000:3000"
         environment:
@@ -26,6 +26,19 @@ services:
     # Make sure the following services are configured in:
     # - /tests/Behat/behat.yml
 
+    redmine-6-1:
+        image: redmine:6.1.0
+        ports:
+            - "5061: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-60100_data/files:/usr/src/redmine/files
+            - ./.docker/redmine-60100_data/sqlite:/usr/src/redmine/sqlite
+
     redmine-6-0:
         image: redmine:6.0.7
         ports:
@@ -50,15 +63,3 @@ services:
         volumes:
             - ./.docker/redmine-50110_data/files:/usr/src/redmine/files
             - ./.docker/redmine-50110_data/sqlite:/usr/src/redmine/sqlite
-
-    redmine-5-0:
-        image: redmine:5.0.12 # There is no tag for 5.0.14 on Docker hub
-        user: "1000:1000"
-        ports:
-            - "5050:3000"
-        environment:
-            REDMINE_SECRET_KEY_BASE: supersecretkey
-            REDMINE_PLUGINS_MIGRATE: true
-        volumes:
-            - ./.docker/redmine-50014_data/files:/usr/src/redmine/files
-            - ./.docker/redmine-50014_data/sqlite:/usr/src/redmine/sqlite
diff --git a/tests/Behat/behat.yml b/tests/Behat/behat.yml
index 1a6a3ccb..e9495383 100644
--- a/tests/Behat/behat.yml
+++ b/tests/Behat/behat.yml
@@ -3,6 +3,11 @@ default:
         default:
             paths:
                 - '%paths.base%/features'
+        redmine_6_1:
+            contexts:
+                - Redmine\Tests\Behat\Bootstrap\FeatureContext:
+                    redmineVersion: '6.1.0'
+                    rootPath: '%paths.base%/../../.docker'
         redmine_6_0:
             contexts:
                 - Redmine\Tests\Behat\Bootstrap\FeatureContext:
@@ -13,14 +18,14 @@ default:
                 - Redmine\Tests\Behat\Bootstrap\FeatureContext:
                     redmineVersion: '5.1.10'
                     rootPath: '%paths.base%/../../.docker'
-        redmine_5_0:
-            contexts:
-                - Redmine\Tests\Behat\Bootstrap\FeatureContext:
-                    redmineVersion: '5.0.14'
-                    rootPath: '%paths.base%/../../.docker'
 
 github-actions:
     suites:
+        redmine_6_1:
+            contexts:
+                - Redmine\Tests\Behat\Bootstrap\FeatureContext:
+                    redmineVersion: '6.1.0'
+                    rootPath: '/home/runner/work/_temp'
         redmine_6_0:
             contexts:
                 - Redmine\Tests\Behat\Bootstrap\FeatureContext:
@@ -31,8 +36,3 @@ github-actions:
                 - Redmine\Tests\Behat\Bootstrap\FeatureContext:
                     redmineVersion: '5.1.10'
                     rootPath: '/home/runner/work/_temp'
-        redmine_5_0:
-            contexts:
-                - Redmine\Tests\Behat\Bootstrap\FeatureContext:
-                    redmineVersion: '5.0.14'
-                    rootPath: '/home/runner/work/_temp'
diff --git a/tests/RedmineExtension/RedmineVersion.php b/tests/RedmineExtension/RedmineVersion.php
index e5acedcc..dade4b2f 100644
--- a/tests/RedmineExtension/RedmineVersion.php
+++ b/tests/RedmineExtension/RedmineVersion.php
@@ -6,6 +6,14 @@
 
 enum RedmineVersion: string
 {
+    /**
+     * Redmine 6.1.0
+     *
+     * @link https://www.redmine.org/versions/198
+     * @link https://www.redmine.org/projects/redmine/wiki/Changelog_6_1#610-2025-09-21
+     */
+    case V6_1_0 = '6.1.0';
+
     /**
      * Redmine 6.0.7
      *