diff --git a/rubygem-flexmock-2.3.6-minitest-5_19-compat.patch b/rubygem-flexmock-2.3.6-minitest-5_19-compat.patch
new file mode 100644
index 0000000..927ff76
--- /dev/null
+++ b/rubygem-flexmock-2.3.6-minitest-5_19-compat.patch
@@ -0,0 +1,17 @@
+diff -urp flexmock-2.3.6.orig/lib/flexmock/minitest_integration.rb flexmock-2.3.6/lib/flexmock/minitest_integration.rb
+--- flexmock-2.3.6.orig/lib/flexmock/minitest_integration.rb	2023-08-08 15:37:23.756749381 +0900
++++ flexmock-2.3.6/lib/flexmock/minitest_integration.rb	2023-08-08 15:48:14.279445467 +0900
+@@ -8,11 +8,8 @@
+ # above copyright notice is included.
+ #+++
+ 
+-begin
+-  require 'minitest/assertions'
+-rescue LoadError
+-  require 'minitest/unit'
+-end
++require 'minitest/assertions'
++require 'minitest/unit'
+ 
+ require 'flexmock/base'
+ require 'flexmock/test_unit_assert_spy_called'
diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec
index 6446ab7..8061d90 100644
--- a/rubygem-flexmock.spec
+++ b/rubygem-flexmock.spec
@@ -18,6 +18,8 @@ Patch1:	rubygem-flexmock-2.3.6-testsuite-binding-source.patch
 Patch2:	rubygem-flexmock-2.3.6-accept-keywords.patch
 # relax error messages on test suite on ruby 3.0
 Patch3:	rubygem-flexmock-2.3.6-workaround-relax-error-message.patch
+# Support MiniTest 5.19+
+Patch4:	rubygem-flexmock-2.3.6-minitest-5_19-compat.patch
 
 Requires:	ruby(release)
 BuildRequires:	ruby(release)
@@ -47,10 +49,11 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
 (
 cd flexmock
-%patch1 -p1
-%patch3 -p1
+%patch -P1 -p1
+%patch -P3 -p1
 )
-%patch2 -p1
+%patch -P2 -p1
+%patch -P4 -p1
 
 find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d'
 find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644
@@ -100,6 +103,9 @@ popd
 %{gem_docdir}/
 
 %changelog
+* Tue Aug 08 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.6-15
+- Handle MiniTest 5.19+
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild