diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1591a1f..e661eae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - 3.0
+          - 2.7
           - 2.6
           - 2.5
         gemfile:
diff --git a/.ruby-version b/.ruby-version
index 5154b3f..9f55b2c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6
+3.0
diff --git a/diaspora_federation-json_schema.gemspec b/diaspora_federation-json_schema.gemspec
index affccc0..4f782b8 100644
--- a/diaspora_federation-json_schema.gemspec
+++ b/diaspora_federation-json_schema.gemspec
@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
 
   s.files       = Dir["lib/diaspora_federation/schemas.rb", "lib/diaspora_federation/schemas/*.json"]
 
-  s.required_ruby_version = "~> 2.5"
+  s.required_ruby_version = ">= 2.5"
 end
diff --git a/diaspora_federation-rails.gemspec b/diaspora_federation-rails.gemspec
index 72eed7d..223b0e5 100644
--- a/diaspora_federation-rails.gemspec
+++ b/diaspora_federation-rails.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.files       = Dir["app/**/*", "config/routes.rb", "config/initializers/*",
                       "lib/diaspora_federation/{engine,rails}.rb", "LICENSE", "README.md", "Changelog.md"]
 
-  s.required_ruby_version = "~> 2.5"
+  s.required_ruby_version = ">= 2.5"
 
   s.add_dependency "actionpack", ">= 5.2", "< 7"
 
diff --git a/diaspora_federation-test.gemspec b/diaspora_federation-test.gemspec
index 40a0da8..de886bd 100644
--- a/diaspora_federation-test.gemspec
+++ b/diaspora_federation-test.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.files       = Dir["lib/diaspora_federation/test.rb", "lib/diaspora_federation/test/*"]
 
-  s.required_ruby_version = "~> 2.5"
+  s.required_ruby_version = ">= 2.5"
 
   s.add_dependency "diaspora_federation", DiasporaFederation::VERSION
   s.add_dependency "fabrication", "~> 2.16"
diff --git a/diaspora_federation.gemspec b/diaspora_federation.gemspec
index ee0fb02..8e8cc0d 100644
--- a/diaspora_federation.gemspec
+++ b/diaspora_federation.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
                         "lib/diaspora_federation/test/*",
                         "lib/tasks/*.rake"]
 
-  s.required_ruby_version = "~> 2.5"
+  s.required_ruby_version = ">= 2.5"
 
   s.add_dependency "faraday", "~> 1.0"
   s.add_dependency "faraday_middleware", "~> 1.0"
diff --git a/spec/controllers/diaspora_federation/webfinger_controller_spec.rb b/spec/controllers/diaspora_federation/webfinger_controller_spec.rb
index c1a4fa1..1e0af9d 100644
--- a/spec/controllers/diaspora_federation/webfinger_controller_spec.rb
+++ b/spec/controllers/diaspora_federation/webfinger_controller_spec.rb
@@ -78,7 +78,7 @@ module DiasporaFederation
         it "raises when the resource parameter is missing" do
           expect {
             get :webfinger, format: :json
-          }.to raise_error ActionController::ParameterMissing, "param is missing or the value is empty: resource"
+          }.to raise_error ActionController::ParameterMissing, /param is missing or the value is empty: resource/
         end
 
         it "calls the fetch_person_for_webfinger callback" do