diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 53181b685a..b76359e486 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-12  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.gdb/complaints.exp: Use with_test_prefix.
+	* gdb.xml/tdesc-regs.exp: Same.
+	* gdb.opt/inline-locals.exp: Fix test name.
+
 2020-05-12  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.dwarf2/comp-unit-lang.exp: Use with_test_prefix.
diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp
index b4a5ab3087..922530caa5 100644
--- a/gdb/testsuite/gdb.gdb/complaints.exp
+++ b/gdb/testsuite/gdb.gdb/complaints.exp
@@ -65,9 +65,11 @@ proc test_initial_complaints { } {
 	"During symbol reading: Register a complaint"
 
     # Re-issue the first message #1
-    gdb_test_stdio \
-	"call complaint_internal (\$cstr)" \
-	"During symbol reading: Register a complaint"
+    with_test_prefix "re-issue" {
+	gdb_test_stdio \
+	    "call complaint_internal (\$cstr)" \
+	    "During symbol reading: Register a complaint"
+    }
 
     # Add a second complaint, expect it
     gdb_test_stdio \
diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp
index 3dee0aabfe..8104b0f5b7 100644
--- a/gdb/testsuite/gdb.opt/inline-locals.exp
+++ b/gdb/testsuite/gdb.opt/inline-locals.exp
@@ -95,7 +95,7 @@ if { ! $no_frames } {
     set pass_re "array = {$decimal, \[^\r\n\]*}"
     set kfail_re [multi_line $pass_re \
 		      "array = {<optimized out> <repeats 64 times>}"]
-    gdb_test_multiple "info locals" "info locals above bar 2" {
+    gdb_test_multiple "info locals" "info locals above bar 3" {
 	-re -wrap $pass_re {
 	    pass $gdb_test_name
 	}
diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp
index 1ec20a1944..bb04420b24 100644
--- a/gdb/testsuite/gdb.xml/tdesc-regs.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp
@@ -184,6 +184,8 @@ gdb_test "ptype \$mixed_flags" \
 gdb_test "maintenance print reggroups" \
     " Group\[ \t\]+Type\[ \t\]+\r\n.* general\[ \t\]+user\[ \t\]+\r\n.* foo\[ \t\]+user\[ \t\]+"
 
-load_description "core-only.xml" "" "test-regs.xml"
-# The extra register from the previous description should be gone.
-gdb_test "ptype \$extrareg" "type = void"
+with_test_prefix "core-only.xml" {
+    load_description "core-only.xml" "" "test-regs.xml"
+    # The extra register from the previous description should be gone.
+    gdb_test "ptype \$extrareg" "type = void"
+}