diff --git a/subversion-1.9.4-ruby22-fixes.rb b/subversion-1.9.4-ruby22-fixes.rb
new file mode 100644
index 0000000..f227a30
--- /dev/null
+++ b/subversion-1.9.4-ruby22-fixes.rb
@@ -0,0 +1,13 @@
+Index: subversion/bindings/swig/ruby/test/test_repos.rb
+===================================================================
+--- subversion/bindings/swig/ruby/test/test_repos.rb	(revision 1671099)
++++ subversion/bindings/swig/ruby/test/test_repos.rb	(working copy)
+@@ -679,7 +679,7 @@
+       dest_path = File.join(@tmp_path, "dest")
+       Svn::Repos.create(dest_path) do |repos|
+         assert_raises(NoMethodError) do
+-          repos.load_fs(nil)
++          repos.load_fs(Object.new)
+         end
+       end
+ 
diff --git a/subversion.spec b/subversion.spec
index 6c948a4..ea52236 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,5 +1,5 @@
 # set to zero to avoid running test suite
-%define make_check 0
+%define make_check 1
 
 %define with_java 1
 %define with_kwallet 1
@@ -20,7 +20,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.9.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: Development/Tools
 URL: http://subversion.apache.org/
@@ -39,6 +39,8 @@ Patch3: subversion-1.9.4-kwallet.patch
 Patch4: subversion-1.8.0-rubybind.patch
 Patch5: subversion-1.8.5-swigplWall.patch
 Patch6: subversion-1.8.13-swigpython.patch
+# Revert one of Ruby 2.2 fixes which is necessary also for 1.9.4
+Patch7: subversion-1.9.4-ruby22-fixes.rb
 
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: libdb-devel >= 4.1.25, swig >= 1.3.24, gettext
@@ -183,6 +185,7 @@ This package includes supplementary tools for use with Subversion.
 %patch4 -p1 -b .rubybind
 %patch5 -p1 -b .swigplWall
 %patch6 -p1 -b .swigpython
+%patch7 -p0 -b .ruby22-fixes
 
 %build
 # Regenerate the buildsystem, so that:
@@ -467,6 +470,10 @@ make check-javahl
 %endif
 
 %changelog
+* Wed May 25 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.9.4-2
+- Enable tests
+- Revert one of Ruby 2.2 fixes
+
 * Sun May  8 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.9.4-1
 - Update to 1.9.4 (#1331222) CVE-2016-2167 CVE-2016-2168
 - Move tools in docs to tools subpackage (rhbz 1171757 1199761)