diff --git a/Gemfile b/Gemfile
index b7a7b80445..4781c1f20d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -202,7 +202,7 @@ group :test do
   gem 'rspec-json_expectations', require: false
 
   # It is needed to use #assigns(attribute) in controllers tests
-  gem 'minitest', '~> 5.0' # TODO: remove constraint when we upgrade to Rails 8, see https://github.com/minitest/minitest/issues/1040
+  gem 'minitest', '~> 6.0' # TODO: remove constraint when we upgrade to Rails 8, see https://github.com/minitest/minitest/issues/1040
   gem 'minitest-profiler'
   gem 'rails-controller-testing'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 01c2845222..e787795dfb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -321,7 +321,9 @@ GEM
       benchmark
       logger
     mini_mime (1.1.5)
-    minitest (5.27.0)
+    minitest (6.0.5)
+      drb (~> 2.0)
+      prism (~> 1.5)
     minitest-profiler (0.0.2)
       activesupport (>= 4.1.0)
       minitest (>= 5.3.3)
@@ -702,7 +704,7 @@ DEPENDENCIES
   launchy
   listen
   logger
-  minitest (~> 5.0)
+  minitest (~> 6.0)
   minitest-profiler
   mocha
   multi_json