diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index d799415..8111d46 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -22,13 +22,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rails-version: ['5.2.5', '6.0.3.6', '6.1.3.1', 'main']
-        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+        rails-version: ['5.2.5', '6.0.3.6', '6.1.3.1', '7.0.5', 'main']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
         exclude:
-          - rails-version: 'main'
-            ruby-version: '2.5'
-          - rails-version: 'main'
-            ruby-version: '2.6'
           - rails-version: '5.2.5'
             ruby-version: '3.0'
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba0f01e..73480fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,15 +4,15 @@
 
 * Added support for URLs with non-ASCII characters in them. In other words, your application shouldn't get stuck in a an infinite redirect loop when a request contains non-ASCII characters that can be downcased.
 
-* Added Ruby 3.0 to the test matrix.
+* Added Ruby 3.0, 3.1, 3.2 to the test matrix.
 
-* Added Rails 6.1.x to the build matrix.
+* Added Rails 6.1.x and 7.0.x to the build matrix.
 
 * Dropped support for Rails 4. Going forward we're targetting Rails 5.x (and 6.x). Rails 5 deprecates a few configuration options that we need access to. If you still need support for Rails 4.x, version 1.2.2 of route_downcaser should work just fine.
 
 * Dropped support for Rails versions older than 5.2 (ie 5.0.x, 5.1.x). They are outside Rails official maintenance policy.
 
-* Dropped support for Ruby versions older than 2.5 (ie 2.2, 2.3, 2.4). They are EOL and should not be used in production.
+* Dropped support for Ruby versions older than 2.7 (ie 2.2, 2.3, 2.4, 2.5, 2.6). They are EOL and should not be used in production. We are keeping support for 2.7 around a bit yet, as to have support for at least one 2.x version.
 
 ## 1.2.3