diff --git a/gdb/testsuite/gdb.ada/dynamic-iface.exp b/gdb/testsuite/gdb.ada/dynamic-iface.exp
index 13e93966819..d4d7ba45ab4 100644
--- a/gdb/testsuite/gdb.ada/dynamic-iface.exp
+++ b/gdb/testsuite/gdb.ada/dynamic-iface.exp
@@ -17,10 +17,7 @@ load_lib "ada.exp"
 
 require !skip_ada_tests
 
-if {![gnat_runtime_has_debug_info]} {
-    untested "GNAT runtime debuginfo required for this test"
-    return -1
-}
+require gnat_runtime_has_debug_info
 
 standard_ada_testfile main
 
diff --git a/gdb/testsuite/gdb.ada/interface.exp b/gdb/testsuite/gdb.ada/interface.exp
index c1b2bf87e15..93a0bd5e8b6 100644
--- a/gdb/testsuite/gdb.ada/interface.exp
+++ b/gdb/testsuite/gdb.ada/interface.exp
@@ -17,10 +17,7 @@ load_lib "ada.exp"
 
 require !skip_ada_tests
 
-if {![gnat_runtime_has_debug_info]} {
-    untested "GNAT runtime debuginfo required for this test"
-    return -1
-}
+require gnat_runtime_has_debug_info
 
 standard_ada_testfile foo
 
diff --git a/gdb/testsuite/gdb.ada/iwide.exp b/gdb/testsuite/gdb.ada/iwide.exp
index 89386c5a851..40c45d88117 100644
--- a/gdb/testsuite/gdb.ada/iwide.exp
+++ b/gdb/testsuite/gdb.ada/iwide.exp
@@ -17,10 +17,7 @@ load_lib "ada.exp"
 
 require !skip_ada_tests
 
-if {![gnat_runtime_has_debug_info]} {
-    untested "GNAT runtime debuginfo required for this test"
-    return -1
-}
+require gnat_runtime_has_debug_info
 
 standard_ada_testfile p
 
diff --git a/gdb/testsuite/gdb.ada/mi_interface.exp b/gdb/testsuite/gdb.ada/mi_interface.exp
index 88829faf457..50e6df7851f 100644
--- a/gdb/testsuite/gdb.ada/mi_interface.exp
+++ b/gdb/testsuite/gdb.ada/mi_interface.exp
@@ -17,10 +17,7 @@ load_lib "ada.exp"
 
 require !skip_ada_tests
 
-if {![gnat_runtime_has_debug_info]} {
-    untested "GNAT runtime debuginfo required for this test"
-    return -1
-}
+require gnat_runtime_has_debug_info
 
 standard_ada_testfile foo
 
diff --git a/gdb/testsuite/gdb.ada/tagged.exp b/gdb/testsuite/gdb.ada/tagged.exp
index bbefa8d966d..319252922af 100644
--- a/gdb/testsuite/gdb.ada/tagged.exp
+++ b/gdb/testsuite/gdb.ada/tagged.exp
@@ -17,10 +17,7 @@ load_lib "ada.exp"
 
 require !skip_ada_tests
 
-if {![gnat_runtime_has_debug_info]} {
-    untested "GNAT runtime debuginfo required for this test"
-    return -1
-}
+require gnat_runtime_has_debug_info
 
 standard_ada_testfile foo
 
diff --git a/gdb/testsuite/gdb.ada/tagged_access.exp b/gdb/testsuite/gdb.ada/tagged_access.exp
index 17e5f6d971e..69eb6702b25 100644
--- a/gdb/testsuite/gdb.ada/tagged_access.exp
+++ b/gdb/testsuite/gdb.ada/tagged_access.exp
@@ -17,10 +17,7 @@ load_lib "ada.exp"
 
 require !skip_ada_tests
 
-if {![gnat_runtime_has_debug_info]} {
-    untested "GNAT runtime debuginfo required for this test"
-    return -1
-}
+require gnat_runtime_has_debug_info
 
 standard_ada_testfile p