diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9c7ba5..bf3ac66 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,4 +39,4 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - run: rake
+      - run: bundle exec rake
diff --git a/Gemfile b/Gemfile
index 2ed9522..15f3bcf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,12 @@
 source "https://www.rubygems.org"
 
 group :development do
-  gem 'minitest', '~> 5.0'
+  gem 'minitest', '> 5.0'
+  # MT6 restricts supported versions, therefore older Rubies sticks with MT5,
+  # which includes `minitest/mock`
+  if RUBY_VERSION >= "3.2"
+    gem 'minitest-mock'
+  else
+  end
   gem 'rake', '>= 12', '< 14'
 end
diff --git a/test/helper.rb b/test/helper.rb
index cb8fdd9..5ff21cd 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -4,6 +4,7 @@
 require 'rubygems/version'
 
 require 'minitest/autorun'
+require 'minitest/mock'
 
 # Ruby 2.0 + 2.1 compatibility.
 module Minitest