diff --git a/subversion-1.14.1-fixjavatests.patch b/subversion-1.14.1-fixjavatests.patch
new file mode 100644
index 0000000..b7a79b0
--- /dev/null
+++ b/subversion-1.14.1-fixjavatests.patch
@@ -0,0 +1,30 @@
+
+See upstream dev@subversion thread.  Fixes intermittent failure of
+javahl tests, particularly reproducible on aarch64.
+
+Message-ID: <11de5f5c-5059-b973-95a1-385e7913a63a@syntevo.com>
+From: Alexandr Miloslavskiy
+
+--- subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java.fixjavatests
++++ subversion-1.14.1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+@@ -4676,7 +4676,19 @@
+             // RuntimeException("Test exception") is expected here
+         }
+ 
+-        tunnelAgent.joinAndTest();
++        // In this test, there is a race condition that sometimes results in
++        // IOException when 'WAIT_TUNNEL' tries to read from a pipe that
++        // already has its read end closed. This is not an error, but
++        // it's hard to distinguish this case from other IOException which
++        // indicate a problem. To reproduce, simply wrap this test's body in
++        // a loop. The workaround is to ignore any detected IOException.
++        //
++        // tunnelAgent.joinAndTest();
++        try {
++            tunnelAgent.join();
++        } catch (InterruptedException e) {
++            e.printStackTrace ();
++        }
+     }
+ 
+     /**
diff --git a/subversion-1.14.1-testnoautoprops.patch b/subversion-1.14.1-testnoautoprops.patch
new file mode 100644
index 0000000..96dd59d
--- /dev/null
+++ b/subversion-1.14.1-testnoautoprops.patch
@@ -0,0 +1,14 @@
+
+Fix intermittent failures when "svn add" guesses a near-empty file is binary and hence
+the output is different.
+
+--- subversion-1.14.1/subversion/tests/cmdline/svntest/main.py.testnoautoprops
++++ subversion-1.14.1/subversion/tests/cmdline/svntest/main.py
+@@ -691,6 +691,7 @@
+ 
+ [miscellany]
+ interactive-conflicts = false
++enable-auto-props = no
+ """
+     if exclusive_wc_locks:
+       config_contents += """
diff --git a/subversion.spec b/subversion.spec
index 4c11a77..401700b 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,6 +1,5 @@
-# set to zero to avoid running test suite
-# Temporary disable the tests for Perl mass rebuild
-%bcond_with tests
+# Disable to avoid all the test suites
+%bcond_without tests
 
 %if 0%{?rhel} || 0%{?eln}
 %bcond_with kwallet
@@ -57,7 +56,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.14.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: ASL 2.0
 URL: https://subversion.apache.org/
 Source0: https://downloads.apache.org/subversion/subversion-%{version}.tar.bz2
@@ -73,6 +72,8 @@ Patch2: subversion-1.14.0-testwarn.patch
 Patch3: subversion-1.14.0-soversion.patch
 Patch4: subversion-1.8.0-rubybind.patch
 Patch5: subversion-1.8.5-swigplWall.patch
+Patch6: subversion-1.14.1-testnoautoprops.patch
+Patch7: subversion-1.14.1-fixjavatests.patch
 BuildRequires: make
 BuildRequires: autoconf, libtool, texinfo, which, gcc, gcc-c++
 BuildRequires: swig >= 1.3.24, gettext
@@ -234,6 +235,8 @@ This package includes supplementary tools for use with Subversion.
 %patch3 -p1 -b .soversion
 %patch4 -p1 -b .rubybind
 %patch5 -p1 -b .swigplWall
+%patch6 -p1 -b .testnoautoprops
+%patch7 -p1 -b .fixjavatests
 
 :
 : === Building:
@@ -574,6 +577,9 @@ make check-javahl
 %endif
 
 %changelog
+* Thu Jul 29 2021 Joe Orton <jorton@redhat.com> - 1.14.1-6
+- fix intermittent FTBFS in tests (#1956806)
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild