diff --git a/containerd.changes b/containerd.changes
index b731b0f..b3edd43 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun  5 06:38:40 UTC 2018 - asarai@suse.com
+
+- Remove 'go test' from %check section, as it has only ever caused us problems
+  and hasn't (as far as I remember) ever caught a release-blocking issue. Smoke
+  testing has been far more useful. boo#1095817
+
 -------------------------------------------------------------------
 Thu Feb  1 16:57:14 CET 2018 - ro@suse.de
 
diff --git a/containerd.spec b/containerd.spec
index 580961e..ce996d4 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -111,12 +111,11 @@ cp $PROJECT/bin/containerd containerd-%{version}
 cp $PROJECT/bin/containerd-shim containerd-shim-%{version}
 
 %check
-export GOPATH=$HOME/go/src/github.com/containerd/containerd/vendor:$GOPATH
-cd $HOME/go/src/github.com/containerd/containerd
-%go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | \
-	grep    github.com/containerd/containerd | \
-	grep -v github.com/containerd/containerd/vendor | \
-	grep -v /integration-test)
+# We used to run 'go test' here, however we found that this actually didn't
+# catch any issues that were caught by smoke testing, and %check would
+# continually cause package builds to fail due to flaky tests. If you ever need
+# to know how the testing was done, you can always look in the package history.
+# boo#1095817
 
 %install
 install -D -m755 containerd-%{version} %{buildroot}/%{_sbindir}/containerd