diff --git a/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d
index d276af1a70d..5dbe70fa466 100644
--- a/gas/testsuite/gas/s390/esa-g5.d
+++ b/gas/testsuite/gas/s390/esa-g5.d
@@ -1,4 +1,4 @@
-#name: s390 opcode
+#name: s390 opcode (esa g5)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/esa-reloc.d b/gas/testsuite/gas/s390/esa-reloc.d
index 0b13cb626a6..6f32a50c2bf 100644
--- a/gas/testsuite/gas/s390/esa-reloc.d
+++ b/gas/testsuite/gas/s390/esa-reloc.d
@@ -1,4 +1,4 @@
-#name: s390 reloc
+#name: s390 reloc (esa reloc)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/esa-z9-109.d b/gas/testsuite/gas/s390/esa-z9-109.d
index 99310eb677d..c09193956c3 100644
--- a/gas/testsuite/gas/s390/esa-z9-109.d
+++ b/gas/testsuite/gas/s390/esa-z9-109.d
@@ -1,4 +1,4 @@
-#name: s390 opcode
+#name: s390 opcode (esa z9 109)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/esa-z900.d b/gas/testsuite/gas/s390/esa-z900.d
index 75e3a385815..c734b9ca32f 100644
--- a/gas/testsuite/gas/s390/esa-z900.d
+++ b/gas/testsuite/gas/s390/esa-z900.d
@@ -1,4 +1,4 @@
-#name: s390 opcode
+#name: s390 opcode (esa z900)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/esa-z990.d b/gas/testsuite/gas/s390/esa-z990.d
index 8358cdc3c20..4992557ede5 100644
--- a/gas/testsuite/gas/s390/esa-z990.d
+++ b/gas/testsuite/gas/s390/esa-z990.d
@@ -1,4 +1,4 @@
-#name: s390 opcode
+#name: s390 opcode (esa z990)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-arch12.d b/gas/testsuite/gas/s390/zarch-arch12.d
index ac016482b5a..d463bcd1240 100644
--- a/gas/testsuite/gas/s390/zarch-arch12.d
+++ b/gas/testsuite/gas/s390/zarch-arch12.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (arch12)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-arch13.d b/gas/testsuite/gas/s390/zarch-arch13.d
index 3ebdd9c17f3..1435a719236 100644
--- a/gas/testsuite/gas/s390/zarch-arch13.d
+++ b/gas/testsuite/gas/s390/zarch-arch13.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (arch 13)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-arch14.d b/gas/testsuite/gas/s390/zarch-arch14.d
index 62db69ccb2d..cca13ba493c 100644
--- a/gas/testsuite/gas/s390/zarch-arch14.d
+++ b/gas/testsuite/gas/s390/zarch-arch14.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (arch14)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-arch15.d b/gas/testsuite/gas/s390/zarch-arch15.d
index 9cd99b7a698..dd049a00d77 100644
--- a/gas/testsuite/gas/s390/zarch-arch15.d
+++ b/gas/testsuite/gas/s390/zarch-arch15.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (arch15)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z10.d b/gas/testsuite/gas/s390/zarch-z10.d
index beb057878d6..2e3cce02b6d 100644
--- a/gas/testsuite/gas/s390/zarch-z10.d
+++ b/gas/testsuite/gas/s390/zarch-z10.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (z10)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z13.d b/gas/testsuite/gas/s390/zarch-z13.d
index bfb6fe1ba83..d768e0b9db5 100644
--- a/gas/testsuite/gas/s390/zarch-z13.d
+++ b/gas/testsuite/gas/s390/zarch-z13.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (z13)
 #objdump: -dr
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z196.d b/gas/testsuite/gas/s390/zarch-z196.d
index ac2478d6219..365ccbf88b5 100644
--- a/gas/testsuite/gas/s390/zarch-z196.d
+++ b/gas/testsuite/gas/s390/zarch-z196.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (z196)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z9-109.d b/gas/testsuite/gas/s390/zarch-z9-109.d
index 012270e733f..aa05299e42a 100644
--- a/gas/testsuite/gas/s390/zarch-z9-109.d
+++ b/gas/testsuite/gas/s390/zarch-z9-109.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (z9 109)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z9-ec.d b/gas/testsuite/gas/s390/zarch-z9-ec.d
index 2b5ef0f0c3f..d859a0bf6c9 100644
--- a/gas/testsuite/gas/s390/zarch-z9-ec.d
+++ b/gas/testsuite/gas/s390/zarch-z9-ec.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (z9 ec)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z900.d b/gas/testsuite/gas/s390/zarch-z900.d
index 88751711c1b..82dd3b0860d 100644
--- a/gas/testsuite/gas/s390/zarch-z900.d
+++ b/gas/testsuite/gas/s390/zarch-z900.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (z900)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-z990.d b/gas/testsuite/gas/s390/zarch-z990.d
index 980a5f6f2ea..b49dddb92f3 100644
--- a/gas/testsuite/gas/s390/zarch-z990.d
+++ b/gas/testsuite/gas/s390/zarch-z990.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (z990)
 #objdump: -drw
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/s390/zarch-zEC12.d b/gas/testsuite/gas/s390/zarch-zEC12.d
index 57d7becdcdf..04cd1385315 100644
--- a/gas/testsuite/gas/s390/zarch-zEC12.d
+++ b/gas/testsuite/gas/s390/zarch-zEC12.d
@@ -1,4 +1,4 @@
-#name: s390x opcode
+#name: s390x opcodes (zEC12)
 #objdump: -dr
 
 .*: +file format .*