diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9582b80c70..91ac3a66fd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-12  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* gdb.python/py-pp-maint.exp: Extend test names to make them
+	unique.
+
 2021-03-12  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.python/py-explore.exp: Add with_test_prefix to make test
diff --git a/gdb/testsuite/gdb.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp
index f31fae5011..4bda85a8ae 100644
--- a/gdb/testsuite/gdb.python/py-pp-maint.exp
+++ b/gdb/testsuite/gdb.python/py-pp-maint.exp
@@ -66,13 +66,15 @@ gdb_test "disable pretty-printer" \
     "$num_pp printers disabled.*0 of $num_pp printers enabled"
 
 gdb_test "enable pretty-printer" \
-    "$num_pp printers enabled.*$num_pp of $num_pp printers enabled"
+    "$num_pp printers enabled.*$num_pp of $num_pp printers enabled" \
+    "first enable of all pretty printers"
 
 gdb_test "disable pretty-printer global" \
     "$num_pp printers disabled.*0 of $num_pp printers enabled"
 
 gdb_test "enable pretty-printer" \
-    "$num_pp printers enabled.*$num_pp of $num_pp printers enabled"
+    "$num_pp printers enabled.*$num_pp of $num_pp printers enabled" \
+    "second enable of all pretty printers"
 
 gdb_test "disable pretty-printer global lookup_function_lookup_test" \
     "1 printer disabled.*[expr $num_pp - 1] of $num_pp printers enabled"
@@ -81,10 +83,12 @@ gdb_test "disable pretty-printer global pp-test;.*" \
     "[expr $num_pp - 2] printers disabled.*1 of $num_pp printers enabled"
 
 gdb_test "info pretty-printer global .*function" \
-    {.*function_lookup_test \[disabled\].*}
+    {.*function_lookup_test \[disabled\].*} \
+    "info pretty-printer for function, pretty-printer is disabled"
 
 gdb_test "info pretty-printer .* pp-test" \
-    {.*pp-test.*struct ss \[disabled\].*}
+    {.*pp-test.*struct ss \[disabled\].*} \
+    "info pretty-printer for pp-test, pretty-printer is disabled"
 
 gdb_test "print flt" " = {x = 42, y = 43}" \
     "print flt disabled"
@@ -111,7 +115,8 @@ gdb_test "enable pretty-printer global pp-test;.*" \
     "1 printer enabled.*$num_pp of $num_pp printers enabled"
 
 gdb_test "info pretty-printer" \
-    {.*function_lookup_test.*pp-test.*struct ss.*}
+    {.*function_lookup_test.*pp-test.*struct ss.*} \
+    "info pretty-printer after re-enabling"
 
 gdb_test "print flt" " = x=<42> y=<43>" \
     "print flt re-enabled"