diff --git a/0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch b/0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch
new file mode 100644
index 0000000..b9d25f7
--- /dev/null
+++ b/0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch
@@ -0,0 +1,50 @@
+From 824e092dbfefe2366f39e55a3efcc3d99dc1cbf7 Mon Sep 17 00:00:00 2001
+From: Jan Holesovsky <kendy@collabora.com>
+Date: Tue, 25 Aug 2020 15:16:21 +0200
+Subject: [PATCH] CppunitTest_sw_htmlexport: The actual PNG data does not
+ matter.
+
+The test was supposed to test whether the PNG data is embedded (or not),
+not the actual content of the data.  Turns out that a different zlib
+affects the PNG content, so let's ignore that part, and only check that
+the data is actually embedded.
+
+Change-Id: I603bd546d97abda7c47248db0a95349f4a48b4aa
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101329
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ sw/qa/extras/htmlexport/htmlexport.cxx | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
+index 36df600df185..d4d59103fffe 100644
+--- a/sw/qa/extras/htmlexport/htmlexport.cxx
++++ b/sw/qa/extras/htmlexport/htmlexport.cxx
+@@ -357,6 +357,8 @@ DECLARE_HTMLEXPORT_TEST(testNormalImageExport, "textAndImage.docx")
+     CPPUNIT_ASSERT(pDoc);
+ 
+     assertXPath(pDoc, "/html/body", 1);
++
++    // the HTML export normally does not embed the images
+     OUString imgSrc = getXPath(pDoc, "/html/body/p/img", "src");
+     CPPUNIT_ASSERT(imgSrc.endsWith(".png"));
+ }
+@@ -367,7 +369,13 @@ DECLARE_HTMLEXPORT_TEST(testEmbedImagesEnabled, "textAndImage.docx")
+     CPPUNIT_ASSERT(pDoc);
+ 
+     assertXPath(pDoc, "/html/body", 1);
+-    assertXPath(pDoc, "/html/body/p/img", "src", "data:image/png;base64,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");
++
++    // the HTML export normally does not embed the images, but here the test
++    // name triggers setting of the "EmbedImages" filter option, meaning the
++    // image will not be a separate PNG, but an embedded base64 encoded
++    // version of that
++    OUString imgSrc = getXPath(pDoc, "/html/body/p/img", "src");
++    CPPUNIT_ASSERT(imgSrc.startsWith("data:image/png;base64,"));
+ }
+ 
+ DECLARE_HTMLEXPORT_TEST(testXHTML, "hello.html")
+-- 
+2.28.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index fb6fd4d..1969660 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -243,6 +243,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
 Patch3: 0001-fix-detecting-qrcodegen.patch
 Patch4: 0001-Pass-fno-lto-unconditionally.patch
 Patch5: 0001-rhbz-1870501-crash-on-reexport-of-odg.patch
+Patch6: 0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch
 
 %if 0%{?rhel}
 # not upstreamed
@@ -1475,7 +1476,7 @@ for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do
 done
 
 %check
-%ifnarch s390x aarch64
+%ifnarch s390x
 make unitcheck slowcheck
 # we don't need this anymore
 rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar