diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e18366d8adb..ee200ad9abc 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-19  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* gdb.base/bp-permanent.c (NOP): Define as 2-byte instead of
+	4-byte instruction on S390.
+
 2014-11-19  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/arr_arr: New testcase.
diff --git a/gdb/testsuite/gdb.base/bp-permanent.c b/gdb/testsuite/gdb.base/bp-permanent.c
index a45a922e8f3..64cfb4db43e 100644
--- a/gdb/testsuite/gdb.base/bp-permanent.c
+++ b/gdb/testsuite/gdb.base/bp-permanent.c
@@ -21,7 +21,14 @@
 #include <unistd.h>
 #endif
 
+/* NOP instruction: must have the same size as the breakpoint
+   instruction.  */
+
+#if defined(__s390__) || defined(__s390x__)
+#define NOP asm("nopr 0")
+#else
 #define NOP asm("nop")
+#endif
 
 /* Buffer holding the breakpoint instruction.  */
 unsigned char buffer[16];