diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
index 09c32609ba3..50d325aae82 100644
--- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
@@ -83,7 +83,7 @@ proc test_create_delete_modify_tsv { } {
 
 	mi_gdb_test "tvariable \$tvar3 = 3" \
 	    ".*=tsv-created,name=\"tvar3\",initial=\"3\".*\\^done" \
-	    "tvariable \$tvar3 modified"
+	    "tvariable \$tvar3 modified to 3"
 	mi_gdb_test "-break-insert -a gdb_c_test" \
 	    {.*\^done,bkpt=.*} \
 	    "insert tracepoint on gdb_c_test"
@@ -122,7 +122,7 @@ proc test_create_delete_modify_tsv { } {
 	mi_gdb_test "-trace-list-variables" ".*" "list trace variables"
 	mi_gdb_test "tvariable \$tvar3 = 2" \
 	    ".*=tsv-modified,name=\"tvar3\",initial=\"2\",current=\"6\".*\\^done" \
-	    "tvariable \$tvar3 modified"
+	    "tvariable \$tvar3 modified to 2"
 
     }
 }
diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index e133039cf7b..a980b692d1f 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -47,7 +47,8 @@ proc test_tstart_tstop_tstart { } {
 	}
 
 	gdb_test "trace func1" "Tracepoint \[0-9\] at $hex: file.*"
-	gdb_test_no_output "tstart"
+	gdb_test_no_output "tstart" \
+	    "first tstart"
 
 	gdb_breakpoint "end" qualified
 	gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" \
@@ -55,7 +56,8 @@ proc test_tstart_tstop_tstart { } {
 
 	gdb_test_no_output "tstop"
 
-	gdb_test_no_output "tstart"
+	gdb_test_no_output "tstart" \
+	    "second tstart"
     }
 }
 
@@ -103,12 +105,14 @@ proc test_buffer_full_tstart { } {
 	    "" \
 	    "collect buf" "^$"
 
-	gdb_test_no_output "tstart"
+	gdb_test_no_output "tstart" \
+	    "first tstart"
 	gdb_breakpoint "end" qualified
 	gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" "continue to end"
 
 	gdb_test "tstatus" ".*buffer was full.*"
-	gdb_test_no_output "tstart"
+	gdb_test_no_output "tstart" \
+	    "second tstart"
     }
 }
 
diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
index 1e447d4d7ab..880ffc6d4cc 100644
--- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp
+++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
@@ -88,7 +88,8 @@ gdb_test "trace test_function" \
   "set tracepoint at test_function"
 gdb_trace_setactions "Set action for trace point 1" "" \
   "collect var" "^$"
-gdb_test_no_output "tstart"
+gdb_test_no_output "tstart" \
+    "tstart with very small trace buffer"
 gdb_test "continue" \
   "Continuing.*Breakpoint $decimal.*" \
   "run trace experiment 1"
@@ -103,10 +104,11 @@ runto_main
 gdb_breakpoint ${srcfile}:[gdb_get_line_number "breakpoint1"]
 gdb_test "trace test_function" \
   "Tracepoint \[0-9\]+ at .*" \
-  "set tracepoint at test_function"
+  "set tracepoint at test_function again"
 gdb_trace_setactions "Set action for trace point 2" "" \
   "collect var" "^$"
-gdb_test_no_output "tstart"
+gdb_test_no_output "tstart" \
+    "tstart with default trace buffer size"
 gdb_test "continue" \
   "Continuing.*Breakpoint $decimal.*" \
   "run trace experiment 2"