diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 08a5fbf8..7d18d828 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,6 +16,7 @@ jobs:
         - '3.1'
         rails-version:
         - '6.1'
+        - '7.0'
     services:
       postgres:
         image: manageiq/postgresql:13
diff --git a/Gemfile b/Gemfile
index fbf49392..24d8e941 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,10 +13,12 @@ require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundle
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-case ENV['TEST_RAILS_VERSION']
-when "6.0"
-  # Default local bundling to use 6.0 for generating migrations
-  gem "rails",  "~>6.0.4"
-else
-  gem "rails",  "~>6.1.6"
-end
+minimum_version =
+  case ENV['TEST_RAILS_VERSION']
+  when "7.0"
+    "~>7.0.8"
+  else
+    # Default local bundling to use this version for generating migrations
+    "~>6.1.4"
+  end
+gem "rails", minimum_version