diff --git a/golang-googlecode-tools.spec b/golang-googlecode-tools.spec
index 4184d49..1ea3018 100644
--- a/golang-googlecode-tools.spec
+++ b/golang-googlecode-tools.spec
@@ -2,9 +2,15 @@
 %global with_devel 1
 %global with_bundled 0
 %global with_debug 0
+# tests requires golang-docs which is not present on gcc-go archs
+%ifarch %{?golang_arches:%{golang_arches}}%{!?golang_arches:%{ix86} x86_64 %{arm}}
 %global with_check 1
 %global with_unit_test 1
 %else
+%global with_check 0
+%global with_unit_test 0
+%endif
+%else
 %global with_devel 0
 %global with_bundled 0
 %global with_debug 0
@@ -31,7 +37,7 @@
 
 Name:           golang-googlecode-tools
 Version:        0
-Release:        8.1.git%{shortcommit}%{?dist}
+Release:        9.1.git%{shortcommit}%{?dist}
 Summary:        Supplementary tools and packages for Go
 License:        BSD
 URL:            https://%{provider_prefix}
@@ -590,6 +596,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}:/usr/inc
 %endif
 
 %changelog
+* Wed Apr 13 2016 jchaloup <jchaloup@redhat.com> - 0-9.1.git997b354
+- Run tests only on golang architectures
+
 * Thu Mar 03 2016 jchaloup <jchaloup@redhat.com>
 - Polish spec file
   don't check go/importer on ppc