diff --git a/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp b/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp
index b60c020..9b2d1d8 100644
--- a/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp
+++ b/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp
@@ -76,7 +76,15 @@
 }
 
 # Expand cu1.  This will enqueue cu2.
-gdb_test "ptype foo" "type = int"
+set cu1_expanded 0
+gdb_test_multiple "ptype foo" "" {
+    -re -wrap "type = int" {
+	set cu1_expanded 1
+	pass $gdb_test_name
+    }
+}
+
+require {expr $cu1_expanded == 1}
 
 # Now check that cu2 has an address range starting at main.
 set cu2_blockvector_re \