diff --git a/Gemfile b/Gemfile
index b4e2a20..eb29ae9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,7 @@
 source "https://rubygems.org"
 
 gemspec
+
+if RUBY_VERSION >= "3.1"
+  gem "minitest-mock"
+end
diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
index 10609f9..ca2fb0d 100644
--- a/gemfiles/rails_7.2.gemfile
+++ b/gemfiles/rails_7.2.gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "minitest-mock"
 gem "rails", "~> 7.2.0"
 gem "sprockets-rails"
 
diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile
index b0ca58d..188fc88 100644
--- a/gemfiles/rails_8.0.gemfile
+++ b/gemfiles/rails_8.0.gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "minitest-mock"
 gem "rails", "~> 8.0.0"
 gem "bcrypt"
 gem "propshaft"
diff --git a/gemfiles/rails_8.0_sprockets.gemfile b/gemfiles/rails_8.0_sprockets.gemfile
index 6e3a32c..9010cb0 100644
--- a/gemfiles/rails_8.0_sprockets.gemfile
+++ b/gemfiles/rails_8.0_sprockets.gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "minitest-mock"
 gem "rails", "~> 8.0.0"
 gem "bcrypt"
 gem "sprockets-rails"
diff --git a/gemfiles/rails_8.1.gemfile b/gemfiles/rails_8.1.gemfile
index be3ca27..82e13e9 100644
--- a/gemfiles/rails_8.1.gemfile
+++ b/gemfiles/rails_8.1.gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "minitest-mock"
 gem "rails", "~> 8.1.0"
 gem "bcrypt"
 gem "propshaft"
diff --git a/gemfiles/rails_8.1_sprockets.gemfile b/gemfiles/rails_8.1_sprockets.gemfile
index 049019a..cce795a 100644
--- a/gemfiles/rails_8.1_sprockets.gemfile
+++ b/gemfiles/rails_8.1_sprockets.gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "minitest-mock"
 gem "rails", "~> 8.1.0"
 gem "bcrypt"
 gem "sprockets-rails"
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
index 91f51f7..629603c 100644
--- a/gemfiles/rails_edge.gemfile
+++ b/gemfiles/rails_edge.gemfile
@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "minitest-mock"
 gem "rails", github: "rails/rails", branch: "main"
 gem "actionmailer", github: "rails/rails", branch: "main"
 gem "bcrypt"
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d673ee1..9f933b6 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,9 @@
 require "rubygems"
 require "minitest/autorun"
+begin
+  require "minitest/mock"
+rescue LoadError
+end
 require "rails"
 require "rails/test_help"
 require "rails/generators"