diff --git a/test/bno-symbolic.sh b/test/bno-symbolic.sh
index 213a1cc825..3fd3638a41 100755
--- a/test/bno-symbolic.sh
+++ b/test/bno-symbolic.sh
@@ -3,7 +3,7 @@
 
 # GCC produces buggy code for this test case on s390x.
 # https://sourceware.org/bugzilla/show_bug.cgi?id=29655
-[ $MACHINE = s390x ] && $CC -v 2>&1 | grep -E '^gcc version 1[0-4]\.' && skip
+[ $MACHINE = s390x ] && $CC -v 2>&1 | grep -E '^gcc version 1[0-5]\.' && skip
 
 cat <<EOF | $CC -c -fPIC -o$t/a.o -xc -
 int foo = 4;
diff --git a/test/canonical-plt.sh b/test/canonical-plt.sh
index 53188e0e2d..d9eb540536 100755
--- a/test/canonical-plt.sh
+++ b/test/canonical-plt.sh
@@ -3,7 +3,7 @@
 
 # GCC produces buggy code for this test case on s390x.
 # https://sourceware.org/bugzilla/show_bug.cgi?id=29655
-[ $MACHINE = s390x ] && $CC -v 2>&1 | grep -E '^gcc version 1[0-4]\.' && skip
+[ $MACHINE = s390x ] && $CC -v 2>&1 | grep -E '^gcc version 1[0-5]\.' && skip
 
 cat <<EOF | $CC -o $t/a.so -fPIC -shared -xc -
 void *foo() {
diff --git a/test/rodata-name.sh b/test/rodata-name.sh
index def5a6fdc2..31a77bf959 100755
--- a/test/rodata-name.sh
+++ b/test/rodata-name.sh
@@ -5,6 +5,10 @@
 # Concretely speaking, ARM as uses "@" as a start of a comment.
 [ $MACHINE = arm ] && skip
 
+# GCC produces buggy code for this test case on s390x.
+# https://sourceware.org/bugzilla/show_bug.cgi?id=29655
+[ $MACHINE = s390x ] && $CC -v 2>&1 | grep -E '^gcc version 1[45]\.' && skip
+
 cat <<'EOF' | $CC -c -o $t/a.o -x assembler -
 .globl val1, val2, val3, val4, val5