diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index dc32215..cd6cb9c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,12 +12,12 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-        - '2.6'
         - '2.7'
         - '3.0'
         rails-version:
         - '6.0'
         - '6.1'
+        - '7.0'
     env:
       TEST_RAILS_VERSION: ${{ matrix.rails-version }}
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
diff --git a/Gemfile b/Gemfile
index 25b3c07..8c39e4a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in manageiq-messaging.gemspec
 gemspec
 
-case ENV['TEST_RAILS_VERSION']
-when "6.0"
-  gem "activesupport", "~>6.0.4"
-when "6.1"
-  gem "activesupport", "~>6.1.4"
-end
+version = ENV.fetch('TEST_RAILS_VERSION', '6.1')
+raise "Unsupported version of Rails: #{version}" unless %w[6.0 6.1 7.0].include?(version)
+
+gem "activesupport", "~>#{version}", "< #{version.to_f + 0.1}"