diff --git a/Gemfile b/Gemfile
index 0a0e7e84ea..fe23d49502 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'irb'
-gem 'minitest', '5.27.0'
+gem 'minitest', '6.0.5'
+gem 'minitest-mock'
 gem 'pry', '0.16.0'
 gem 'rake', '13.4.2'
 gem 'rdoc'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d014f0a08..4b369c0775 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,6 +14,7 @@ GEM
     concurrent-ruby (1.3.6)
     date (3.5.1)
     docile (1.4.1)
+    drb (2.2.3)
     erb (6.0.4)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
@@ -27,7 +28,10 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     method_source (1.1.0)
-    minitest (5.27.0)
+    minitest (6.0.5)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    minitest-mock (5.27.0)
     parallel (1.28.0)
     parser (3.3.11.1)
       ast (~> 2.4.1)
@@ -101,7 +105,8 @@ DEPENDENCIES
   benchmark-ips
   faker!
   irb
-  minitest (= 5.27.0)
+  minitest (= 6.0.5)
+  minitest-mock
   pry (= 0.16.0)
   rake (= 13.4.2)
   rdoc
diff --git a/test/faker/default/test_faker_boolean.rb b/test/faker/default/test_faker_boolean.rb
index 55af5d1af6..38ff326625 100644
--- a/test/faker/default/test_faker_boolean.rb
+++ b/test/faker/default/test_faker_boolean.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'minitest/mock'
 
 class TestFakerBoolean < Test::Unit::TestCase
   def setup
diff --git a/test/faker/default/test_faker_number.rb b/test/faker/default/test_faker_number.rb
index baca7f1e4c..b53c61ed39 100644
--- a/test/faker/default/test_faker_number.rb
+++ b/test/faker/default/test_faker_number.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'minitest/mock'
 
 class TestFakerNumber < Test::Unit::TestCase
   def setup
diff --git a/test/test_determinism.rb b/test/test_determinism.rb
index 5e33e63e47..f612248af0 100644
--- a/test/test_determinism.rb
+++ b/test/test_determinism.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'minitest/mock'
 require_relative 'test_helper'
+
 # rubocop:disable Security/Eval,Style/EvalWithLocation
 class TestDeterminism < Test::Unit::TestCase
   def setup