diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 15c0caf8532..8566dc14aa3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-09  Pedro Alves  <palves@redhat.com>
+
+	* gdb.asm/asm-source.exp ("kill" test): Match the whole query
+	output.  Fix '?' match.
+
 2017-11-08  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/scoped_watch: New testcase.
diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index 138609a3c80..47717a26a87 100644
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -435,7 +435,7 @@ gdb_test "next" "$line_foo2_leave\[ \t\]+gdbasm_leave" "next over foo3"
 # Like "finish", "return" command also can return to the caller
 # line again or the statement after, depending on the architecture.
 gdb_test_multiple "return" "return from foo2" {
-    -re "Make (foo2|selected stack frame) return now\?.*" {
+    -re "Make (foo2|selected stack frame) return now\\? .y or n. " {
         send_gdb "y\n"
         exp_continue
     }