diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index eb1b9ea3d3..159414ee42 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-04  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* gdb.base/catch-syscall.exp (test_catch_syscall_multi_arch): Set
+	the 'arch1' variable for "s390*-linux*" targets.
+
 2015-03-04  Pedro Alves  <palves@redhat.com>
 
 	* gdb.threads/clone-thread_db.c: Include unistd.h and pthread.h.
diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp
index 8f9dec3006..498ae36124 100644
--- a/gdb/testsuite/gdb.base/catch-syscall.exp
+++ b/gdb/testsuite/gdb.base/catch-syscall.exp
@@ -403,7 +403,7 @@ proc test_catch_syscall_multi_arch {} {
 	verbose "Not testing ARM for multi-arch syscall support"
 	return
     } elseif { [istarget "s390*-linux*"] } {
-	set arch1 ""
+	set arch1 "s390:31-bit"
 	set arch2 "s390:64-bit"
 	set syscall1_name "_newselect"
 	set syscall2_name "select"