diff --git a/test/index.go b/test/index.go
index 122b2a5724..461c2ee418 100644
--- a/test/index.go
+++ b/test/index.go
@@ -225,7 +225,7 @@ func main() {
 				// the next pass from running.
 				// So run it as a separate check.
 				thisPass = 1
-			} else if i == "i64big" || i == "i64bigger" && runtime.GOARCH == "amd64" {
+			} else if a == "s" && n == "" && (i == "i64big" || i == "i64bigger") && runtime.GOARCH == "amd64" {
 				// On amd64, these huge numbers do fit in an int, so they are not
 				// rejected at compile time.
 				thisPass = 0