diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 26135e52ce..4575e2784f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-08  Pedro Alves  <palves@redhat.com>
+
+	* gdb.arch/amd64-entry-value-param-dwarf5.exp: Use with_test_prefix.
+	* gdb.arch/amd64-entry-value-param.exp: Use with_test_prefix.
+
 2017-03-08  Pedro Alves  <palves@redhat.com>
 
 	* gdb.arch/i386-pkru.exp (probe PKRU support): Handle detecting
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp
index 0357ff406d..bbaffd376d 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param-dwarf5.exp
@@ -36,14 +36,20 @@ if ![runto_main] {
 set srcfile $srcfile2
 gdb_breakpoint [gdb_get_line_number "break-here"]
 
-gdb_continue_to_breakpoint "break-here" ".* break-here .*"
-gdb_test "p y" " = 2"
-gdb_test "p b" " = 4"
+with_test_prefix "call 1" {
+    gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+    gdb_test "p y" " = 2"
+    gdb_test "p b" " = 4"
+}
 
-gdb_continue_to_breakpoint "break-here" ".* break-here .*"
-gdb_test "p y" " = 4"
-gdb_test "p b" " = 8"
+with_test_prefix "call 2" {
+    gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+    gdb_test "p y" " = 4"
+    gdb_test "p b" " = 8"
+}
 
-gdb_continue_to_breakpoint "break-here" ".* break-here .*"
-gdb_test "p y" " = 10"
-gdb_test "p b" " = 20"
+with_test_prefix "call 3" {
+    gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+    gdb_test "p y" " = 10"
+    gdb_test "p b" " = 20"
+}
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
index c0072ac00c..2ec9c31e8e 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value-param.exp
@@ -36,14 +36,20 @@ if ![runto_main] {
 set srcfile $srcfile2
 gdb_breakpoint [gdb_get_line_number "break-here"]
 
-gdb_continue_to_breakpoint "break-here" ".* break-here .*"
-gdb_test "p y" " = 2"
-gdb_test "p b" " = 4"
+with_test_prefix "call 1" {
+    gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+    gdb_test "p y" " = 2"
+    gdb_test "p b" " = 4"
+}
 
-gdb_continue_to_breakpoint "break-here" ".* break-here .*"
-gdb_test "p y" " = 4"
-gdb_test "p b" " = 8"
+with_test_prefix "call 2" {
+    gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+    gdb_test "p y" " = 4"
+    gdb_test "p b" " = 8"
+}
 
-gdb_continue_to_breakpoint "break-here" ".* break-here .*"
-gdb_test "p y" " = 10"
-gdb_test "p b" " = 20"
+with_test_prefix "call 3" {
+    gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+    gdb_test "p y" " = 10"
+    gdb_test "p b" " = 20"
+}