diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7fdf8cb6b..318ac046a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04, macos-10.15, windows-2019]
         # 3.0 is interpreted as 3
-        ruby: [2.2, 2.3, 2.4, 2.5, 2.6, 2.7, "3.0"]
+        ruby: [2.2, 2.3, 2.4, 2.5, 2.6, 2.7, "3.0", 3.1, ruby-head]
         exclude:
           - { os: windows-2019 , ruby: 2.2 }
           - { os: windows-2019 , ruby: 2.3 }
diff --git a/spec/code_objects/base_spec.rb b/spec/code_objects/base_spec.rb
index f0820c480..4e766c440 100644
--- a/spec/code_objects/base_spec.rb
+++ b/spec/code_objects/base_spec.rb
@@ -249,7 +249,7 @@ class X; end
   describe "#format" do
     it "sends object to Templates.render" do
       object = MethodObject.new(:root, :method)
-      expect(Templates::Engine).to receive(:render).with(:x => 1, :object => object, :type => object.type)
+      expect(Templates::Engine).to receive(:render).with({:x => 1, :object => object, :type => object.type})
       object.format :x => 1
     end
 
diff --git a/spec/templates/helpers/base_helper_spec.rb b/spec/templates/helpers/base_helper_spec.rb
index 68937318c..fc2cd3863 100644
--- a/spec/templates/helpers/base_helper_spec.rb
+++ b/spec/templates/helpers/base_helper_spec.rb
@@ -97,7 +97,7 @@
 
     it "passes off to #link_url if argument is recognized as a URL" do
       url = "http://yardoc.org/"
-      expect(self).to receive(:link_url).with(url, nil, :target => '_parent')
+      expect(self).to receive(:link_url).with(url, nil, {:target => '_parent'})
       linkify url
     end
 
diff --git a/spec/templates/template_spec.rb b/spec/templates/template_spec.rb
index ab0e7ede1..21808cc24 100644
--- a/spec/templates/template_spec.rb
+++ b/spec/templates/template_spec.rb
@@ -208,7 +208,7 @@ def init; sections 1, 2, 3 end
     it "renders all sections with options" do
       mod = template(:e).new
       allow(mod).to receive(:render_section) {|section| section.name.to_s }
-      expect(mod).to receive(:add_options).with(:a => 1).and_yield
+      expect(mod).to receive(:add_options).with({:a => 1}).and_yield
       mod.sections :a
       expect(mod.run(:a => 1)).to eq 'a'
     end