diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5bd09ce4fce..1bcdaeb69d5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-25  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* lib/ada.exp (gnat_runtime_has_debug_info): Use -wrap with
+	gdb_test_multiple.
+
 2021-03-24  Luis Machado  <luis.machado@linaro.org>
 
 	* gdb.arch/aarch64-mte.c: New file.
diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp
index bdd0a09476e..857b079b9e5 100644
--- a/gdb/testsuite/lib/ada.exp
+++ b/gdb/testsuite/lib/ada.exp
@@ -188,8 +188,8 @@ gdb_caching_proc gnat_runtime_has_debug_info {
     set has_debug_info 0
 
     gdb_test_multiple "whatis __gnat_debug_raise_exception" "" {
-	-re "type = <text variable, no debug info>" { }
-	-re "type = void" {
+	-re -wrap "type = <text variable, no debug info>" { }
+	-re -wrap "type = void" {
 	    set has_debug_info 1
 	}
 	default {