diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 896f633..969fdd5 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.4.6
+Version:        1.4.7
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -73,7 +73,7 @@ install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
 install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
 
 # turn off shared libs and dynamic linking on secondary archs
-%ifarch archv7hl
+%ifarch armv7hl
 cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF
 
 # tests failing on arm
@@ -98,6 +98,10 @@ EOF
 
 
 %changelog
+* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.7-1
+- fix arch for cabal_tests_not_working
+- add cabal_test macro which uses it
+
 * Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.6-1
 - disable Cabal tests on armv7 since they give an internal error
   https://ghc.haskell.org/trac/ghc/ticket/10029
diff --git a/macros.ghc b/macros.ghc
index 5f7668b..5cbacf8 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -28,6 +28,14 @@ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\
 # install
 %cabal_install %cabal copy --destdir=%{buildroot} -v
 
+tests
+%cabal_test\
+%if %{undefined cabal_tests_not_working}\
+%if %{with tests}\
+%cabal test\
+%endif\
+%endif
+
 # root dir for ghc docs (used by ghc.spec)
 %ghc_html_dir %{_docdir}/ghc/html
 # deprecates