diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1a51587b49..1a02cf9fac 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	PR testsuite/12649
+	* gdb.trace/ftrace.exp (test_fast_tracepoints): Import gdb_prompt.
+	Protect gdb_test_multiple by final $gdb_prompt match.
+
 2011-12-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.cp/static-method.exp (have_gcc_45682_fixed, info addr A::func()):
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index f45c6da111..ab0e3bff02 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -76,6 +76,7 @@ proc run_trace_experiment {} {
 }
 
 proc test_fast_tracepoints {} {
+    global gdb_prompt
 
     set fourgood 0
 
@@ -111,10 +112,10 @@ proc test_fast_tracepoints {} {
 	    }
 
 	    gdb_test_multiple "ftrace four_byter" "set 4-byte fast tracepoint" {
-		-re "May not have a fast tracepoint at .*" {
+		-re "May not have a fast tracepoint at .*\r\n$gdb_prompt $" {
 		    pass "4-byte fast tracepoint could not be set"
 		}
-		-re "Fast tracepoint .*" {
+		-re "Fast tracepoint .*\r\n$gdb_prompt $" {
 		    pass "4-byte fast tracepoint is set"
 		    set fourgood 1
 		}