diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
index 7bb9e42..7dab6c0 100644
--- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
+++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
@@ -69,8 +69,8 @@ if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 }
     return 1
 }
 
-gdb_test "break end" ""
-gdb_test "break fail" ""
+gdb_test "break -q end" ""
+gdb_test "break -q fail" ""
 
 gdb_test "ftrace set_point" "Fast tracepoint .*" \
     "fast tracepoint at a long insn"
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index b862680..73bb6cf 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -77,13 +77,13 @@ proc test_fast_tracepoints {} {
 
     set fourgood 0
 
-    gdb_test "break begin" ".*" ""
+    gdb_test "break -q begin" ".*" ""
 
-    gdb_test "break end" ".*" ""
+    gdb_test "break -q end" ".*" ""
 
     gdb_test "print gdb_agent_gdb_trampoline_buffer_error" ".*" ""
 
-    gdb_test "ftrace set_point" "Fast tracepoint .*" \
+    gdb_test "ftrace -q set_point" "Fast tracepoint .*" \
         "fast tracepoint at a long insn"
 
     gdb_trace_setactions "collect at set_point: define actions" \
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index 6770343..6e9d675 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -53,10 +53,10 @@ proc break_trace_same_addr_1 { trace_type option } \
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
 
-    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q end" "Breakpoint \[0-9\] at $hex: file.*"
 
-    gdb_test "break set_point" "Breakpoint \[0-9\] at $hex: file.*"
-    gdb_test "${trace_type} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q set_point" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "${trace_type} -q set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
 
     gdb_test_no_output "tstart"
 
@@ -88,13 +88,13 @@ proc break_trace_same_addr_2 { trace_type1 trace_type2 option } \
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
 
-    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q end" "Breakpoint \[0-9\] at $hex: file.*"
 
-    gdb_test "${trace_type1} set_point" \
+    gdb_test "${trace_type1} -q set_point" \
 	"\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
 	"${trace_type1} set_point (1)"
 
-    gdb_test "${trace_type2} set_point" \
+    gdb_test "${trace_type2} -q set_point" \
 	"\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
 	"${trace_type2} set_point (2)"
 
@@ -126,11 +126,11 @@ proc break_trace_same_addr_3 { trace_type option } \
     }
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
-    gdb_test "break marker" "Breakpoint \[0-9\] at $hex: file.*"
-    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q marker" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q end" "Breakpoint \[0-9\] at $hex: file.*"
 
-    gdb_test "break set_point" "Breakpoint \[0-9\] at $hex: file.*"
-    gdb_test "${trace_type} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q set_point" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "${trace_type} -q set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
 
     gdb_test_no_output "tstart"
 
@@ -164,10 +164,10 @@ proc break_trace_same_addr_4 { trace_type option } \
     }
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
-    gdb_test "break marker" "Breakpoint \[0-9\] at $hex: file.*"
-    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q marker" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q end" "Breakpoint \[0-9\] at $hex: file.*"
 
-    gdb_test "break set_point" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q set_point" "Breakpoint \[0-9\] at $hex: file.*"
     gdb_test "${trace_type} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
 
     gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \
@@ -207,14 +207,14 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \
 	return -1
     }
 
-    gdb_test "break marker" "Breakpoint \[0-9\] at $hex: file.*"
-    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q marker" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q end" "Breakpoint \[0-9\] at $hex: file.*"
 
-    gdb_test "${trace1} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
+    gdb_test "${trace1} -q set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
 	"${trace1} set_point 1"
     gdb_trace_setactions "set action for tracepoint 1" "" \
 	"collect \$$pcreg" "^$"
-    gdb_test "${trace2} after_set_point" \
+    gdb_test "${trace2} -q after_set_point" \
 	"\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
 	"${trace2} after_set_point 1"
 
@@ -227,10 +227,11 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \
 	"continue to marker"
 
     if [string equal $trace3_at_first_loc "1"] {
-	gdb_test "${trace3} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
+	gdb_test "${trace3} -q set_point" \
+	    "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
 	    "${trace3} set_point 2"
     } else {
-	gdb_test "${trace3} after_set_point" \
+	gdb_test "${trace3} -q after_set_point" \
 	    "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
 	    "${trace2} after_set_point 2"
     }
@@ -281,17 +282,17 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \
 	return -1
     }
 
-    gdb_test "break marker" "Breakpoint \[0-9\] at $hex: file.*"
-    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q marker" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q end" "Breakpoint \[0-9\] at $hex: file.*"
 
     gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \
 	"continue to marker"
 
-    gdb_test "${trace1} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
+    gdb_test "${trace1} -q set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
 	"${trace1} set_point 1"
     gdb_trace_setactions "set action for tracepoint 1" "" \
 	"collect \$$pcreg" "^$"
-    gdb_test "${trace2} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
+    gdb_test "${trace2} -q set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
     	"${trace2} set_point 2"
     gdb_trace_setactions "set action for tracepoint 2" "" \
 	"collect \$$spreg" "^$"
diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp
index ec8b1fc..af24069 100644
--- a/gdb/testsuite/gdb.trace/trace-condition.exp
+++ b/gdb/testsuite/gdb.trace/trace-condition.exp
@@ -71,13 +71,13 @@ proc test_tracepoints { trace_command condition num_frames { kfail_proc 0 } } {
 	return 0
     }
 
-    gdb_test "break begin" ".*" ""
+    gdb_test "break -q begin" ".*" ""
 
-    gdb_test "break end" ".*" ""
+    gdb_test "break -q end" ".*" ""
 
     with_test_prefix "${trace_command}: ${condition}" {
 
-	gdb_test "${trace_command} set_point if ${condition}" \
+	gdb_test "${trace_command} -q set_point if ${condition}" \
 	    "\(Fast t|T\)racepoint .*" \
 	    "set tracepoint"
 
diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index c805145..bdc1630 100644
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -81,10 +81,10 @@ proc break_trace_same_addr { trace_type option } \
 
     gdb_test_no_output "set breakpoint always-inserted ${option}"
 
-    gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q end" "Breakpoint \[0-9\] at $hex: file.*"
 
-    gdb_test "break set_point1" "Breakpoint \[0-9\] at $hex: file.*"
-    gdb_test "${trace_type} set_point1" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
+    gdb_test "break -q set_point1" "Breakpoint \[0-9\] at $hex: file.*"
+    gdb_test "${trace_type} -q set_point1" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*"
 
     gdb_test_no_output "tstart"
 
