diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43af2c6..21155c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,12 +12,15 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.7
+          - 3.1
         rails_version:
-          - 5.2.8.1
-          - 6.0.5.1
           - 6.1.6.1
           - 7.0.3.1
+        include:
+          - ruby: '3.0.6' # Rails 6.0 will not run on Ruby 3.1
+            rails_version: '6.0.5.1'
+          - ruby: '2.7.8' # Rails 5.2 will not run on Ruby 3
+            rails_version: '5.2.8.1'
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby