diff --git a/ShellCheck.spec b/ShellCheck.spec
index 8ff58c0..9947944 100644
--- a/ShellCheck.spec
+++ b/ShellCheck.spec
@@ -1,7 +1,9 @@
 %global pkg_name ShellCheck
 
-%ifnarch %{arm}
-%global with_tests 1
+%ifarch %(echo %{ghc_arches_with_ghci} | sed -e s/armv7hl//)
+%bcond_without tests
+%else
+%bcond_with tests
 %endif
 
 # no useful debuginfo for Haskell packages without C sources
@@ -9,7 +11,7 @@
 
 Name:             %{pkg_name}
 Version:          0.3.4
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Tool for checking common errors in POSIX shell scripts
 
 License:          AGPLv3+
@@ -66,7 +68,7 @@ This package provides the Haskell %{name} library development files.
 
 %prep
 %setup -q
-%ifarch %{arm}
+%if %{without tests}
 %patch0 -p1 -b .orig
 %endif
 
@@ -116,6 +118,9 @@ install -Dpm 0644 shellcheck.1 %{buildroot}%{_mandir}/man1/shellcheck.1
 
 
 %changelog
+* Tue Nov  4 2014 Jens Petersen <petersen@redhat.com> - 0.3.4-2
+- only enable tests on archs with ghci except armv7 (#1158522)
+
 * Thu Sep 11 2014 Dridi <dridi.boukelmoune@gmail.com> - 0.3.4-1
 - bumped to version 0.3.4
 - switched to hackage for the source tarball