diff --git a/runc.changes b/runc.changes
index cc6831e..f238d33 100644
--- a/runc.changes
+++ b/runc.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
+
 -------------------------------------------------------------------
 Tue Feb 27 17:18:32 UTC 2018 - asarai@suse.com
 
diff --git a/runc.spec b/runc.spec
index c3b50f6..06b7172 100644
--- a/runc.spec
+++ b/runc.spec
@@ -121,22 +121,11 @@ mv "$HOME/go/src/%project/runc" %{name}-%{version}
 man/md2man-all.sh
 
 %check
-source ./.runc_build_env
-cd $HOME/go/src/%project
-
-PKG_LIST=$(go list ./... \
-		| grep -v '%{project}/libcontainer/cgroups/fs$' \
-		| grep -v '%{project}/libcontainer$' \
-		| grep -v '%{project}/libcontainer/integration$' \
-		| grep -v '%{project}/libcontainer/nsenter$' \
-		| grep -v '%{project}/libcontainer/user$' \
-		| grep -v '%{project}/libcontainer/xattr$' \
-%if ! 0%{?with_libseccomp}
-		| grep -v '%{project}/libcontainer/seccomp$' \
-		| grep -v 'github.com/seccomp/libseccomp-golang$' \
-%endif
-		)
-%go_tool test -buildmode=pie -tags "$BUILDTAGS" -timeout 3m -v $PKG_LIST
+# 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
 source ./.runc_build_env