diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ad8f36d1..767a3ecd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,28 +8,53 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - 2.4
           - 2.5
           - 2.6
           - 2.7
+          - 3.0
+          - 3.1
+          - 3.2
+          - 3.3
         rails:
           - 5.2.0
           - 6.0.0
           - 6.1.0
+          - 7.0.1
           - 7.1.2
-        include:
+        exclude: # These Rails versions are too new for the respective Ruby versions, or vice-versa
+          - ruby: 2.4
+            rails: 6.0.0
           - ruby: 2.4
-            rails: 5.2.0
-          - ruby: 2.7
-            rails: 7.0.1
-          - ruby: 3.0
             rails: 6.1.0
-          - ruby: 3.0
+          - ruby: 2.4
+            rails: 7.0.1
+          - ruby: 2.4
             rails: 7.1.2
-        exclude:
+          - ruby: 2.5
+            rails: 7.0.1
           - ruby: 2.5
             rails: 7.1.2
+          - ruby: 2.6
+            rails: 7.0.1
           - ruby: 2.6
             rails: 7.1.2
+          - ruby: 3.0
+            rails: 5.2.0
+          - ruby: 3.0
+            rails: 6.0.0
+          - ruby: 3.1
+            rails: 5.2.0
+          - ruby: 3.1
+            rails: 6.0.0
+          - ruby: 3.2
+            rails: 5.2.0
+          - ruby: 3.2
+            rails: 6.0.0
+          - ruby: 3.3
+            rails: 5.2.0
+          - ruby: 3.3
+            rails: 6.0.0
     env:
       PERCONA_DB_USER: root
       PERCONA_DB_PASSWORD: root