diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 03a368453c3..e10e99904b6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-04  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	* go.test/go-test.exp (go-set-goarch): Enable tests on s390[x].
+
+	* go.test/go-test.exp: In +build lines, require whitespace around
+	expected strings, fix check for negation.
+
 2014-11-04  Marek Polacek  <polacek@redhat.com>
 
 	* c-c++-common/ubsan/align-2.c: Remove dg-output.
diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
index 71272a3aa90..25e405be5e5 100644
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -244,6 +244,12 @@ proc go-set-goarch { } {
 		set goarch "ppc64"
 	    }
 	}
+	"s390-*-*" {
+	    set goarch "s390"
+	}
+	"s390x-*-*" {
+	    set goarch "s390x"
+	}
 	"sparc*-*-*" {
 	    if [check_effective_target_ilp32] {
 		set goarch "sparc"