diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8cbbac6e..b3131be4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          # - 3.0 # incompatible with rubysl
+          - 3.1
+          - '3.0'
           - 2.7
           - 2.6
           - 2.5
@@ -41,9 +42,13 @@ jobs:
           ruby: 2.5
         # Legacy Rails with newer rubies
         - rails: '~> 5.1.0'
-          ruby: 3.0
+          ruby: '3.0'
         - rails: '~> 5.2.0'
-          ruby: 3.0
+          ruby: '3.0'
+        - rails: '~> 5.1.0'
+          ruby: 3.1
+        - rails: '~> 5.2.0'
+          ruby: 3.1
 
     env:
       RAILS: ${{ matrix.rails }}
diff --git a/Gemfile b/Gemfile
index a5516336..9518a9cb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,10 +12,12 @@ platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
-platforms :rbx do
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0'
-  gem 'rubysl-test-unit'
+if RUBY_ENGINE == 'rbx'
+  platforms :rbx do
+    gem 'rubinius-developer_tools'
+    gem 'rubysl', '~> 2.0'
+    gem 'rubysl-test-unit'
+  end
 end
 
 rails = ENV['RAILS'] || '~> 5.2.0'