diff --git a/gcc/testsuite/go.test/test/env.go b/gcc/testsuite/go.test/test/env.go
index 16b2076447f..28113bcb062 100644
--- a/gcc/testsuite/go.test/test/env.go
+++ b/gcc/testsuite/go.test/test/env.go
@@ -6,7 +6,10 @@
 
 package main
 
-import os "os"
+import (
+	"os"
+	"runtime"
+)
 
 func main() {
 	ga, e0 := os.Getenverror("GOARCH")
@@ -14,8 +17,8 @@ func main() {
 		print("$GOARCH: ", e0.String(), "\n")
 		os.Exit(1)
 	}
-	if ga != "amd64" && ga != "386" && ga != "arm" {
-		print("$GOARCH=", ga, "\n")
+	if ga != runtime.GOARCH {
+		print("$GOARCH=", ga, "!= runtime.GOARCH=", runtime.GOARCH, "\n")
 		os.Exit(1)
 	}
 	xxx, e1 := os.Getenverror("DOES_NOT_EXIST")