diff --git a/libpng.spec b/libpng.spec
index feb16ce..904e593 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,14 +1,15 @@
+%bcond_without check
+
 Summary:       A library of functions for manipulating PNG image format files
 Name:          libpng
 Epoch:         2
 Version:       1.6.37
-Release:       8%{?dist}
+Release:       10%{?dist}
 License:       zlib
 URL:           http://www.libpng.org/pub/png/
 
 Source0:       https://github.com/glennrp/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:       pngusr.dfa
-Source2:       pngtest-aarch64.png
 Patch0:        libpng-multilib.patch
 Patch1:        libpng-fix-arm-neon.patch
 
@@ -61,12 +62,6 @@ The libpng-tools package contains tools used by the authors of libpng.
 # Provide pngusr.dfa for build.
 cp -p %{SOURCE1} .
 
-%ifarch aarch64
-# zlib on aarch64 produces output different from other arches:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1665221
-cp -p %{SOURCE2} pngtest.png
-%endif
-
 %patch0 -p1
 %patch1 -p1 -b .arm
 
@@ -81,9 +76,8 @@ autoreconf -vif
 # We don't ship .la files.
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+%if 0%{?with_check}
 %check
-#to run make check use "--with check"
-%if %{?_with_check:1}%{!?_with_check:0}
 make check
 %endif
 
@@ -110,6 +104,13 @@ make check
 %{_bindir}/pngfix
 
 %changelog
+* Wed Mar 24 2021 Nikola Forró <nforro@redhat.com> - 2:1.6.37-10
+- Remove the aarch64 test workaround, the patches causing the failures
+  have been dropped in zlib-1.2.11-25
+
+* Thu Feb 11 2021 Nikola Forró <nforro@redhat.com> - 2:1.6.37-9
+- Run %check by default
+
 * Fri Feb 05 2021 Nikola Forró <nforro@redhat.com> - 2:1.6.37-8
 - Use proper pngtest.png reference image on aarch64
 
diff --git a/pngtest-aarch64.png b/pngtest-aarch64.png
deleted file mode 100644
index a5e52b3..0000000
Binary files a/pngtest-aarch64.png and /dev/null differ