diff --git a/test/nilptr3.go b/test/nilptr3.go
index 1ba774d839..817d2aec74 100644
--- a/test/nilptr3.go
+++ b/test/nilptr3.go
@@ -1,8 +1,8 @@
 // errorcheck -0 -d=nil
 // Fails on ppc64x because of incomplete optimization.
 // See issues 9058.
-// Same reason for mips64x.
-// +build !ppc64,!ppc64le,!mips64,!mips64le,!amd64
+// Same reason for mips64x and s390x.
+// +build !ppc64,!ppc64le,!mips64,!mips64le,!amd64,!s390x
 
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style