diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 39318c7..5d98d60 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # actions/checkout@v6 see https://github.com/actions/checkout/releases/tag/v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # actions/checkout@v6 see https://github.com/actions/checkout/releases/tag/v6
       with:
         fetch-depth: 0 # fetch everything
     - name: Set up Ruby
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c4f3c0d..9c6b6d7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
     steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # actions/checkout@v6 see https://github.com/actions/checkout/releases/tag/v6
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # actions/checkout@v6 see https://github.com/actions/checkout/releases/tag/v6
     - name: Set up Ruby
       uses: ruby/setup-ruby@4c56a21280b36d862b5fc31348f463d60bdc55d5 # ruby/setup-ruby@v1 see https://github.com/ruby/setup-ruby/tree/v1
       with:
diff --git a/gemfiles/Gemfile.rails71 b/gemfiles/Gemfile.rails71
index 0027fa3..cc2730a 100644
--- a/gemfiles/Gemfile.rails71
+++ b/gemfiles/Gemfile.rails71
@@ -4,3 +4,6 @@ gemspec path: '..'
 
 gem 'activerecord',  '~> 7.1.0'
 gem 'activesupport', '~> 7.1.0'
+
+# Rails <= 8.0 does not support minitest 6
+gem 'minitest', '>= 5.11', '< 6.0'
diff --git a/gemfiles/Gemfile.rails72 b/gemfiles/Gemfile.rails72
index f0d108a..1030086 100644
--- a/gemfiles/Gemfile.rails72
+++ b/gemfiles/Gemfile.rails72
@@ -4,3 +4,6 @@ gemspec path: '..'
 
 gem 'activerecord',  '~> 7.2.0'
 gem 'activesupport', '~> 7.2.0'
+
+# Rails <= 8.0 does not support minitest 6
+gem 'minitest', '>= 5.11', '< 6.0'
diff --git a/test/test_helper.rb b/test/test_helper.rb
index a55763b..5ab0611 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -7,7 +7,7 @@
 ActiveRecord::Migrator.migrations_paths = [File.expand_path('../test/dummy/db/migrate', __dir__)]
 ActiveRecord::Migrator.migrations_paths << File.expand_path('../db/migrate', __dir__)
 require 'rails/test_help'
-require 'minitest/mock'
+require 'minitest/autorun'
 
 ENV['INTEGRATION_DRIVER'] ||= 'chrome_headless'
 require 'ndr_dev_support/integration_testing'