diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec
index c15adb6..071c9ed 100644
--- a/rubygem-activesupport.spec
+++ b/rubygem-activesupport.spec
@@ -4,7 +4,7 @@ Summary: Support and utility classes used by the Rails framework
 Name: rubygem-%{gem_name}
 Epoch: 1
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -23,6 +23,10 @@ Source2: activesupport-%{version}-tests.tgz
 # dependency on a file in the greater rails proj
 Patch1: activesupport-tests-fix.patch
 
+# Allow the test suite to be run out of Rails git repo layout
+# See https://github.com/rails/rails/pull/19625
+Patch2: activesupport-4.2.1-run-out-of-rails-git.patch
+
 # We need to add the bigdecimal dependency to gemspec, otherwise it won't be
 # loaded. The reason for this is unbundling it from ruby libdir and moving
 # it under %%{gem_dir} (therefore if not in Gemfile, it won't be found).
@@ -63,6 +67,7 @@ tar xzvf %{SOURCE2} -C .%{gem_instdir}
 
 pushd .%{gem_instdir}
 %patch1 -p0
+%patch2 -p2
 popd
 
 pushd .%{gem_dir}
@@ -78,8 +83,9 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}
 
 %check
 pushd %{buildroot}%{gem_instdir}
-# TODO: Run test in order! Otherwise we have get a lot of errors.
-ruby -Ilib:test -e "Dir.glob('./test/**/*_test.rb').each {|t| require t}" | grep '6 failures, 95 errors'
+# 1 failure, 5 errors
+# Rails tests still require Minitest 5.3.3
+ruby -Ilib:test -e "Dir.glob('./test/**/*_test.rb').each {|t| require t}" | grep '1 failures, 5 errors'
 popd
 
 %files
@@ -95,6 +101,9 @@ popd
 
 
 %changelog
+* Fri Mar 20 2015 Josef Stribny <jstribny@redhat.com> - 1:4.2.1-2
+- Fix tests
+
 * Fri Mar 20 2015 Josef Stribny <jstribny@redhat.com> - 1:4.2.1-1
 - Update to activesupport 4.2.1
 
diff --git a/sources b/sources
index ba2e603..97827d7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7e8fae6e8277408d9f60b4287900d402  activesupport-4.2.1-tests.tgz
-99e138421467a2b8ff753736c65bebcc  activesupport-4.2.1.gem
+bf105dcc0607f1c8be1b495f66d79a9f  activesupport-4.2.1-tests.tgz