diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 960d40b0b531..3627140b8da4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-04  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	PR testsuite/69766
+	* go.test/go-test.exp: S/390: Set GOARCH to the current target when
+	testing multiarch.
+
 2016-03-04  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/69947
diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
index 92f6c41678d2..e867051c9ef9 100644
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -248,11 +248,12 @@ proc go-set-goarch { } {
 		}
 	    }
 	}
-	"s390-*-*" {
-	    set goarch "s390"
-	}
-	"s390x-*-*" {
-	    set goarch "s390x"
+	"s390*-*-*" {
+	    if [check_effective_target_ilp32] {
+		set goarch "s390"
+	    } else {
+		set goarch "s390x"
+	    }
 	}
 	"sparc*-*-*" {
 	    if [check_effective_target_ilp32] {