diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec
index 6608baa..14150d8 100644
--- a/rubygem-flexmock.spec
+++ b/rubygem-flexmock.spec
@@ -2,10 +2,16 @@
 
 %global	gem_name	flexmock
 
+%if 0%{?fedora} >= 21
+%global	gem_minitest	rubygem(minitest4)
+%else
+%global	gem_minitest	rubygem(minitest)
+%endif
+
 Summary:	Mock object library for ruby
 Name:		rubygem-%{gem_name}
 Version:	1.3.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		Development/Languages
 License:	Copyright only
 URL:		http://flexmock.rubyforge.org
@@ -14,8 +20,7 @@ Source0:	http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
 Requires:	ruby(release)
 BuildRequires:	ruby(release)
 BuildRequires:	rubygems-devel
-BuildRequires:	rubygem(minitest)
-BuildRequires:	rubygem(rake)
+BuildRequires:	%gem_minitest
 Requires:	ruby(rubygems)
 Provides:	rubygem(%{gem_name}) = %{version}-%{release}
 BuildArch:	noarch
@@ -61,7 +66,7 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
 
 %check
 pushd .%{gem_instdir}
-rake test_all --trace
+ruby -Ilib:. -e 'gem "minitest", "~>4"; Dir.glob("test/*_test.rb").each {|f| require f}'
 
 %files
 %defattr(-,root,root,-)
@@ -91,6 +96,9 @@ rake test_all --trace
 %endif
 
 %changelog
+* Thu Jun 19 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.3-3
+- Force to use minitest ver4 for now
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild