diff --git a/python-pygit2.spec b/python-pygit2.spec
index 6a2aacc..8ec3f3d 100644
--- a/python-pygit2.spec
+++ b/python-pygit2.spec
@@ -1,3 +1,11 @@
+%if 0%{?fedora} && 0%{?fedora} <= 28
+  # https://github.com/libgit2/pygit2/issues/811
+  # https://github.com/libgit2/pygit2/issues/812
+  %global arch_test_fail aarch64 ppc64 s390x
+%else
+  # https://github.com/libgit2/pygit2/issues/811
+  %global arch_test_fail ppc64 s390x
+%endif
 %global pkgname pygit2
 
 Name:           python-%{pkgname}
@@ -75,8 +83,7 @@ find %{_builddir} -name '.buildinfo' -delete
 find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
 
 %check
-# https://github.com/libgit2/pygit2/issues/812
-%ifarch ppc64 s390x
+%ifarch arch_test_fail
   PYTHONPATH=%{buildroot}%{python2_sitearch} py.test-%{python2_version} -v || :
   PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-%{python3_version} -v || :
 %else