diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index 189a240979f0a5ef8c76843c66842faedaf0f2cc..a4ea94354b724bc65740e996f017372774225f6c 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -16,9 +16,7 @@
 # Until "set follow-fork-mode" and "catch fork" are implemented on
 # other targets...
 #
-if {![istarget "*-*-linux*"]} {
-    return
-}
+require {istarget "*-*-linux*"}
 
 # Checkpoint support is currently implemented in the Linux native
 # target, so only works with "target native".
diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp
index 0846441eac71cfc30d4c2368c27abb1a0706a61b..cdfded5c11156354151c84e78c1f6714ecacbe83 100644
--- a/gdb/testsuite/gdb.base/foll-exec-mode.exp
+++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp
@@ -35,9 +35,7 @@ if { [target_info exists gdb_protocol]
 
 # Until "catch exec" is implemented on other targets...
 #
-if {![istarget "*-linux*"]} {
-     return
-}
+require {istarget "*-linux*"}
 
 standard_testfile foll-exec-mode.c
 
diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp
index 0092fcceaccbd44cf19b71443d92950c37d24c95..8da3e5f663550d6a6c40f4f77f5481825f2a8fbd 100644
--- a/gdb/testsuite/gdb.base/foll-exec.exp
+++ b/gdb/testsuite/gdb.base/foll-exec.exp
@@ -18,9 +18,7 @@
 
 # Until "catch exec" is implemented on other targets...
 #
-if {![istarget "*-linux*"]} {
-    return
-}
+require {istarget "*-linux*"}
 
 standard_testfile foll-exec.c
 
diff --git a/gdb/testsuite/gdb.base/inferior-died.exp b/gdb/testsuite/gdb.base/inferior-died.exp
index 4a72e8da98ba690119dcac844bd15653e7e1a978..7717b2fd9294e9076b3da33c4179e4cffbb639db 100644
--- a/gdb/testsuite/gdb.base/inferior-died.exp
+++ b/gdb/testsuite/gdb.base/inferior-died.exp
@@ -16,10 +16,7 @@
 # Until "set follow-fork-mode" and "catch fork" are implemented on
 # other targets...
 #
-if {![istarget "*-*-linux*"]} {
-    unsupported "inferior-died.exp"
-    return
-}
+require {istarget "*-*-linux*"}
 
 require support_displaced_stepping
 
diff --git a/gdb/testsuite/gdb.base/jit-reader-exec.exp b/gdb/testsuite/gdb.base/jit-reader-exec.exp
index d1009449fd0afc380a48f85aede5cf59a7de57b8..ef28ba44f2d87a76d8e71b4b478065c49421abf2 100644
--- a/gdb/testsuite/gdb.base/jit-reader-exec.exp
+++ b/gdb/testsuite/gdb.base/jit-reader-exec.exp
@@ -17,9 +17,7 @@
 # inferior that used the JIT API then exec'd a program that did not
 # use it.
 
-if {![istarget "*-linux*"]} {
-    return
-}
+require {istarget "*-linux*"}
 
 standard_testfile jit-reader-exec.c
 
diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp
index 542d36efec71ea093ad65dda6937e0b693b41d40..02dd327cad753ea45a0b03edfa9f6d88bacf0678 100644
--- a/gdb/testsuite/gdb.base/multi-forks.exp
+++ b/gdb/testsuite/gdb.base/multi-forks.exp
@@ -16,9 +16,7 @@
 # Until "set follow-fork-mode" and "catch fork" are implemented on
 # other targets...
 #
-if {![istarget "*-*-linux*"]} {
-    return
-}
+require {istarget "*-*-linux*"}
 
 
 standard_testfile .c
diff --git a/gdb/testsuite/gdb.base/pie-execl.exp b/gdb/testsuite/gdb.base/pie-execl.exp
index d47fd5160d0977cc67550c8d46d3be3fcec47299..156deefb222f98632bbb8ebeafa0a49536706e10 100644
--- a/gdb/testsuite/gdb.base/pie-execl.exp
+++ b/gdb/testsuite/gdb.base/pie-execl.exp
@@ -19,9 +19,7 @@
 global inferior_spawn_id
 global gdb_spawn_id
 
-if ![istarget *-linux*] {
-    return
-}
+require {istarget *-linux*}
 
 # In remote mode we cannot use the 'set args' command, and this
 # test requires it.
diff --git a/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp b/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp
index 94da7e7ce970079786a440afd3f6446295741e1a..b51257c20cca68f66d72c88fb1d830a4e6c5ebce 100644
--- a/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp
+++ b/gdb/testsuite/gdb.base/step-indirect-call-thunk.exp
@@ -15,9 +15,7 @@
 
 standard_testfile
 
-if { ![istarget "x86*"] } {
-    return
-}
+require {istarget "x86*"}
 
 set cflags "-mindirect-branch=thunk -mfunction-return=thunk"
 
diff --git a/gdb/testsuite/gdb.threads/check-libthread-db.exp b/gdb/testsuite/gdb.threads/check-libthread-db.exp
index 2324b7f27e68012a15ef5e029bd259eaf6c567d1..051c2322eca06edfd6089a5033c5acb6e6e95e14 100644
--- a/gdb/testsuite/gdb.threads/check-libthread-db.exp
+++ b/gdb/testsuite/gdb.threads/check-libthread-db.exp
@@ -14,9 +14,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This test only works for native processes on GNU/Linux.
-if {[target_info gdb_protocol] != "" || ![istarget *-linux*]} {
+if {[target_info gdb_protocol] != ""} {
     return
 }
+require {istarget *-linux*}
 
 # Test relies on checking gdb debug output. Do not run if gdb debug is
 # enabled as any debug will be redirected to the log.