diff --git a/diffutils-fix-gnulib-tests.patch b/diffutils-fix-gnulib-tests.patch
new file mode 100644
index 0000000..3f62b2b
--- /dev/null
+++ b/diffutils-fix-gnulib-tests.patch
@@ -0,0 +1,26 @@
+diff -up diffutils-3.7/gnulib-tests/test-perror2.c.fix-gnulib-tests diffutils-3.7/gnulib-tests/test-perror2.c
+--- diffutils-3.7/gnulib-tests/test-perror2.c.fix-gnulib-tests	2018-01-07 00:45:53.000000000 +0000
++++ diffutils-3.7/gnulib-tests/test-perror2.c	2020-10-08 14:36:15.002040558 +0100
+@@ -79,9 +79,6 @@ main (void)
+     errno = -5;
+     perror ("");
+     ASSERT (!ferror (stderr));
+-    ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
+-    ASSERT (msg2 == msg4 || STREQ (msg2, str2));
+-    ASSERT (msg3 == msg4 || STREQ (msg3, str3));
+     ASSERT (STREQ (msg4, str4));
+ 
+     free (str1);
+diff -up diffutils-3.7/gnulib-tests/test-strerror_r.c.fix-gnulib-tests diffutils-3.7/gnulib-tests/test-strerror_r.c
+--- diffutils-3.7/gnulib-tests/test-strerror_r.c.fix-gnulib-tests	2018-01-07 00:45:53.000000000 +0000
++++ diffutils-3.7/gnulib-tests/test-strerror_r.c	2020-10-08 14:36:15.003040568 +0100
+@@ -165,9 +165,6 @@ main (void)
+ 
+     strerror_r (EACCES, buf, sizeof buf);
+     strerror_r (-5, buf, sizeof buf);
+-    ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
+-    ASSERT (msg2 == msg4 || STREQ (msg2, str2));
+-    ASSERT (msg3 == msg4 || STREQ (msg3, str3));
+     ASSERT (STREQ (msg4, str4));
+ 
+     free (str1);
diff --git a/diffutils.spec b/diffutils.spec
index f5f01d7..6bddf76 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -1,11 +1,12 @@
 Summary: A GNU collection of diff utilities
 Name: diffutils
 Version: 3.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
 Patch1: diffutils-cmp-s-empty.patch
 Patch2: diffutils-i18n.patch
+Patch3: diffutils-fix-gnulib-tests.patch
 License: GPLv3+
 Provides: bundled(gnulib)
 BuildRequires:  gcc
@@ -32,6 +33,9 @@ Install diffutils if you need to compare text files.
 
 %patch2 -p1 -b .i18n
 
+# Fix from gnulib upstream, commit 175e0bc (bug #1863423).
+%patch3 -p1 -b .fix-gnulib-tests
+
 # Run autoreconf for aarch64 support (bug #925256).
 autoreconf
 
@@ -58,6 +62,9 @@ make check
 %{_infodir}/diffutils.info*
 
 %changelog
+* Thu Oct  8 2020 Tim Waugh <twaugh@redhat.com> - 3.7-7
+- Fix from gnulib upstream, commit 175e0bc (bug #1863423).
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-6
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild