+2021-03-12  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * gdb.python/py-explore-cc.exp: Extend test names to make them
+       unique.
+
 2021-03-12  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * gdb.python/py-lookup-type.exp: Remove duplicate test.
 
         pass "explore b"
         gdb_test_multiple "0" "explore_base_class_A" {
             -re "The value of 'b\.A' is a struct/class of type 'A' with no fields\." {
-                pass "explore_base_class_A"
+                pass "explore_base_class_A, exploring b"
                 gdb_test_multiple "\0" "return_to_b_from_A" {
                     -re ".*$b_desc.*Enter the field number of choice:.*" {
                         pass "return_to_b_from_A"
                                 pass "explore_field_c_of_b"
                                 gdb_test_multiple "\0" "return_to_b_from_c" {
                                     -re "$b_desc.*Enter the field number of choice:.*" {
-                                        pass "return_to_b_from_i"
+                                        pass "return_to_b_from_c"
                                     }
                                 }
                             }
         pass "explore B"
         gdb_test_multiple "0" "explore_base_class_A" {
             -re "base class 'A' of 'B' is a struct/class of type 'A' with no fields\." {
-                pass "explore_base_class_A"
+                pass "explore_base_class_A, exploring B"
                 gdb_test_multiple "\0" "return_to_B" {
                     -re "$B_desc.*Enter the field number of choice:.*" {
                         pass "return_to_B"
                                 pass "explore_field_i_of_B"
                                 gdb_test_multiple "\0" "return_to_B_from_i" {
                                     -re "$B_desc.*Enter the field number of choice:.*" {
-                                        pass "return_to_B_from_i"
+                                        pass "return_to_B_from_i, exploring B"
                                     }
                                 }
                             }