diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ffce818..7dbb1f8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,6 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+        # Legacy - If a version breaks, just drop it, don't fix it.
         - ruby: 2.5.7
           gemfile: Gemfile
         - ruby: 2.6.10
@@ -24,12 +25,16 @@ jobs:
           gemfile: Gemfile
         - ruby: 3.1.2
           gemfile: Gemfile
+
+        # Officially supported
         - ruby: 3.2.1
           gemfile: Gemfile
         - ruby: 3.3.6
           gemfile: Gemfile
         - ruby: 3.4.1
           gemfile: Gemfile
+        - ruby: 4.0.1
+          gemfile: Gemfile
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 908d6e4..44da3fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,9 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 ### Compatible changes
-
 - Add support for Ruby 3.3
 - Add support for Ruby 3.4
+- Add support for Ruby 4.0
 
 ## 3.2.0 - 2023-03-01