diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index da31935c269..cdeedb1db91 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-02  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+        * gcc.dg/builtin-bswap-6a.c: Add -march=z900 for s390 and s390x in
+	order to make -m31 work.
+        * gcc.dg/optimize-bswapsi-1.c: Likewise.
+        * gcc.dg/optimize-bswapsi-2.c: Likewise.
+
 2015-12-02  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/68533
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-6a.c b/gcc/testsuite/gcc.dg/builtin-bswap-6a.c
index a8b953122b0..90dfd7d6242 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-6a.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-6a.c
@@ -1,7 +1,7 @@
 /* { dg-do compile { target arm*-*-* alpha*-*-* i?86-*-* powerpc*-*-* rs6000-*-* x86_64-*-* s390*-*-* } } */
 /* { dg-require-effective-target stdint_types } */
 /* { dg-options "-O2 -fdump-rtl-combine" } */
-/* { dg-additional-options "-march=z900" { target s390-*-* } } */
+/* { dg-additional-options "-march=z900" { target s390*-*-* } } */
 
 /* The test is similiar to builtin-bswap-6.c but returns 1/2 instead
    of 0/1 to prevent GCC from calculating the return value with
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c b/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c
index fb1d884c0fb..77916a7a955 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c
@@ -2,7 +2,7 @@
 /* { dg-require-effective-target bswap32 } */
 /* { dg-require-effective-target stdint_types } */
 /* { dg-options "-O2 -fdump-tree-bswap" } */
-/* { dg-additional-options "-march=z900" { target s390-*-* } } */
+/* { dg-additional-options "-march=z900" { target s390*-*-* } } */
 
 #include <stdint.h>
 
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapsi-2.c b/gcc/testsuite/gcc.dg/optimize-bswapsi-2.c
index dfa37634226..a1558af2cc7 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapsi-2.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapsi-2.c
@@ -2,7 +2,7 @@
 /* { dg-require-effective-target bswap32 } */
 /* { dg-require-effective-target stdint_types } */
 /* { dg-options "-O2 -fdump-tree-bswap" } */
-/* { dg-additional-options "-march=z900" { target s390-*-* } } */
+/* { dg-additional-options "-march=z900" { target s390*-*-* } } */
 
 #include <stdint.h>