diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e451964d..0ac45ebe2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,46 +9,46 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental || false }}
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7', '3.0', '3.1', jruby-head, ruby-head]
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
         rails_version:
           - '6.0.0'
           - '6.1.0'
           - '7.0.0'
-          - 'edge'
         include:
           # Rails 5.2
-          - ruby: 2.6
+          - ruby: '2.6'
             rails_version: '5.2.0'
-          - ruby: 2.7
+          - ruby: '2.7'
             rails_version: '5.2.0'
-          - ruby: jruby-9.2
+          - ruby: 'jruby-9.2'
             rails_version: '5.2.0'
 
           # Ruby 2.6
-          - ruby: 2.6
+          - ruby: '2.6'
             rails_version: '6.0.0'
-          - ruby: 2.6
+          - ruby: '2.6'
             rails_version: '6.1.0'
 
           # jruby-9.2
-          - ruby: jruby-9.2
+          - ruby: 'jruby-9.2'
             rails_version: '6.0.0'
-          - ruby: jruby-9.2
+          - ruby: 'jruby-9.2'
             rails_version: '6.1.0'
 
           # jruby-9.3
-          - ruby: jruby-9.3
+          - ruby: 'jruby-9.3'
+            rails_version: '6.1.0'
+          - ruby: 'jruby-9.3'
             rails_version: '7.0.0'
-          - ruby: jruby-9.3
-            rails_version: 'edge'
 
-          #
-          # The past
-          #
-          # EOL Active Record
+          # EOL Rails
           - ruby: 2.2
             rails_version: '3.2.0'
           - ruby: 2.1
@@ -60,21 +60,36 @@ jobs:
           - ruby: 2.5
             rails_version: '5.1.0'
 
-    continue-on-error: ${{ matrix.rails_version == 'edge' || endsWith(matrix.ruby, 'head') }}
+          # Experimental
+          - ruby: 'ruby-head'
+            rails_version: '7.0.0'
+            experimental: true
+          - ruby: 'jruby-head'
+            rails_version: '7.0.0'
+            experimental: true
+          - ruby: '3.1'
+            rails_version: 'edge'
+            experimental: true
+          - ruby: 'jruby-9.3'
+            rails_version: 'edge'
+            experimental: true
 
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
+      continue-on-error: ${{ matrix.experimental || false }}
       env:
         RAILS_VERSION: ${{ matrix.rails_version }}
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
+      continue-on-error: ${{ matrix.experimental || false }}
       env:
         RAILS_VERSION: ${{ matrix.rails_version }}
       run: bundle exec rspec
     - name: Coveralls Parallel
+      continue-on-error: ${{ matrix.experimental || false }}
       uses: coverallsapp/github-action@master
       with:
         github-token: ${{ secrets.github_token }}