diff --git a/usr.bin/asa/tests/asa_test.sh b/usr.bin/asa/tests/asa_test.sh
index 91515bb55d95..2b8fecb12d98 100644
--- a/usr.bin/asa/tests/asa_test.sh
+++ b/usr.bin/asa/tests/asa_test.sh
@@ -1,110 +1,111 @@
 #
 # Copyright (c) 2023 Klara, Inc.
 #
 # SPDX-License-Identifier: BSD-2-Clause
 #
 
 a="The magic words are"
 b="Squeamish Ossifrage"
 
 atf_check_asa() {
 	atf_check -o file:"$2" asa "$1"
 	atf_check -o file:"$2" asa <"$1"
 	atf_check -o file:"$2" asa - <"$1"
 }
 
 atf_test_case space
 space_head() {
 	atf_set descr "First character on line is ' '"
 }
 space_body() {
 	printf " %s\n %s\n" "$a" "$b" >infile
 	printf "%s\n%s\n" "$a" "$b" >outfile
 	atf_check_asa infile outfile
 }
 
 atf_test_case zero
 zero_head() {
 	atf_set descr "First character on line is '0'"
 }
 zero_body() {
 	printf " %s\n0%s\n" "$a" "$b" >infile
 	printf "%s\n\n%s\n" "$a" "$b" >outfile
 	atf_check_asa infile outfile
 }
 
 atf_test_case one
 one_head() {
 	atf_set descr "First character on line is '1'"
 }
 one_body() {
 	printf "1%s\n1%s\n" "$a" "$b" >infile
 	printf "\f%s\n\f%s\n" "$a" "$b" >outfile
 	atf_check_asa infile outfile
 }
 
 atf_test_case plus
 plus_head() {
 	atf_set descr "First character on line is '+'"
 }
 plus_body() {
 	printf " %s\n+%s\n" "$a" "$b" >infile
 	printf "%s\r%s\n" "$a" "$b" >outfile
 	atf_check_asa infile outfile
 }
 
 atf_test_case plus_top
 plus_top_head() {
 	atf_set descr "First character in input is '+'"
 }
 plus_top_body() {
 	printf "+%s\n+%s\n" "$a" "$b" >infile
 	printf "%s\r%s\n" "$a" "$b" >outfile
 	atf_check_asa infile outfile
 }
 
 atf_test_case stdout
 stdout_head() {
 	atf_set descr "Failure to write to stdout"
 }
 stdout_body() {
 	(
 		trap "" PIPE
+		sleep 1
 		echo " $a $b" | asa 2>stderr
 		echo $? >result
 	) | true
 	atf_check -o inline:"1\n" cat result
 	atf_check -o match:"stdout" cat stderr
 }
 
 atf_test_case dashdash
 dashdash_head() {
 	atf_set descr "Use -- to end options"
 }
 dashdash_body() {
 	echo " $a $b" >-infile
 	atf_check -s not-exit:0 -e match:"illegal option" asa -infile
 	atf_check -o inline:"$a $b\n" asa -- -infile
 }
 
 atf_test_case unterminated
 unterminated_head() {
 	atf_set descr "Unterminated input"
 }
 unterminated_body() {
 	printf " %s\n %s" "$a" "$b" >infile
 	printf "%s\n%s" "$a" "$b" >outfile
 	atf_check_asa infile outfile
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case space
 	atf_add_test_case zero
 	atf_add_test_case one
 	atf_add_test_case plus
 	atf_add_test_case plus_top
 	atf_add_test_case stdout
 	atf_add_test_case dashdash
 	atf_add_test_case unterminated
 }
diff --git a/usr.bin/cmp/tests/cmp_test2.sh b/usr.bin/cmp/tests/cmp_test2.sh
index 2ec6071851d3..bca8fc18a6b8 100755
--- a/usr.bin/cmp/tests/cmp_test2.sh
+++ b/usr.bin/cmp/tests/cmp_test2.sh
@@ -1,174 +1,175 @@
 # SPDX-License-Identifier: BSD-2-Clause
 #
 # Copyright (c) 2017 Alan Somers
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
 atf_test_case special
 special_head() {
 	atf_set "descr" "Test cmp(1)'s handling of non-regular files"
 }
 special_body() {
 	echo 0123456789abcdef > a
 	echo 0123456789abcdeg > b
 	atf_check -s exit:0 -o empty -e empty cmp a - <a
 	atf_check -s exit:0 -o empty -e empty cmp - a <a
 	atf_check -s exit:1 -o not-empty -e empty cmp a - <b
 	atf_check -s exit:1 -o not-empty -e empty cmp - a <b
 
 	atf_check -s exit:0 -o empty -e empty cmp a a <&-
 }
 
 atf_test_case symlink
 symlink_head() {
 	atf_set "descr" "Test cmp(1)'s handling of symlinks"
 }
 symlink_body() {
 	echo 0123456789abcdef > a
 	echo 0123456789abcdeg > b
 	ln -s a a.lnk
 	ln -s b b.lnk
 	ln -s a a2.lnk
 	cp a adup
 	ln -s adup adup.lnk
 	atf_check -s exit:0 cmp a a.lnk
 	atf_check -s exit:0 cmp a.lnk a
 	atf_check -s not-exit:0 -o ignore cmp a b.lnk
 	atf_check -s not-exit:0 -o ignore cmp b.lnk a
 	atf_check -s not-exit:0 -o ignore -e ignore cmp -h a a.lnk
 	atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk a
 	atf_check -s exit:0 cmp -h a.lnk a2.lnk
 	atf_check -s not-exit:0 -o ignore -e ignore cmp -h a.lnk adup.lnk
 }
 
 atf_test_case pr252542
 pr252542_head()
 {
 	atf_set "descr" "Test cmp(1) -s with file offset skips"
 }
 pr252542_body()
 {
 	echo -n '1234567890' > a
 	echo -n 'abc567890' > b
 	echo -n 'xbc567890' > c
 	atf_check -s exit:0 cmp -s a b 4 3
 	atf_check -s exit:0 cmp -i 4:3 -s a b
 	atf_check -s exit:0 cmp -i 1 -s b c
 	atf_check -s exit:1 -o ignore cmp -z a b 4 3
 	atf_check -s exit:1 -o ignore cmp -i 4:3 -z a b
 	atf_check -s exit:1 -o ignore cmp -i 1 -z a b
 }
 
 atf_test_case skipsuff
 skipsuff_head()
 {
 	atf_set "descr" "Test cmp(1) accepting SI suffixes on skips"
 }
 skipsuff_body()
 {
 
 	jot -nb a -s '' 1028 > a
 	jot -nb b -s '' 1024 > b
 	jot -nb a -s '' 4 >> b
 
 	atf_check -s exit:1 -o ignore cmp -s a b
 	atf_check -s exit:0 cmp -s a b 1k 1k
 }
 
 atf_test_case limit
 limit_head()
 {
 	atf_set "descr" "Test cmp(1) -n (limit)"
 }
 limit_body()
 {
 	echo -n "aaaabbbb" > a
 	echo -n "aaaaxxxx" > b
 
 	atf_check -s exit:1 -o ignore cmp -s a b
 	atf_check -s exit:0 cmp -sn 4 a b
 	atf_check -s exit:0 cmp -sn 3 a b
 	atf_check -s exit:1 -o ignore cmp -sn 5 a b
 
 	# Test special, too.  The implementation for link is effectively
 	# identical.
 	atf_check -s exit:0 -e empty cmp -sn 4 b - <a
 	atf_check -s exit:0 -e empty cmp -sn 3 b - <a
 	atf_check -s exit:1 -o ignore cmp -sn 5 b - <a
 }
 
 atf_test_case bflag
 bflag_head()
 {
 	atf_set "descr" "Test cmp(1) -b (print bytes)"
 }
 bflag_body()
 {
 	echo -n "abcd" > a
 	echo -n "abdd" > b
 
 	atf_check -s exit:1 -o file:$(atf_get_srcdir)/b_flag.out \
 	    cmp -b a b
 	atf_check -s exit:1 -o file:$(atf_get_srcdir)/bl_flag.out \
 	    cmp -bl a b
 }
 
 # Helper for stdout test case
 atf_check_stdout()
 {
 	(
 		trap "" PIPE
+		sleep 1
 		cmp "$@" 2>stderr
 		echo $? >result
 	) | true
 	atf_check -o inline:"2\n" cat result
 	atf_check -o match:"stdout" cat stderr
 }
 
 atf_test_case stdout
 stdout_head()
 {
 	atf_set descr "Failure to write to stdout"
 }
 stdout_body()
 {
 	echo a >a
 	echo b >b
 	atf_check_stdout a b
 	atf_check_stdout - b <a
 	atf_check_stdout a - <b
 	ln -s a alnk
 	ln -s b blnk
 	atf_check_stdout -h alnk blnk
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case special
 	atf_add_test_case symlink
 	atf_add_test_case pr252542
 	atf_add_test_case skipsuff
 	atf_add_test_case limit
 	atf_add_test_case bflag
 	atf_add_test_case stdout
 }
diff --git a/usr.bin/env/tests/env_test.sh b/usr.bin/env/tests/env_test.sh
index 2dc8f1a4c911..3210361eb223 100644
--- a/usr.bin/env/tests/env_test.sh
+++ b/usr.bin/env/tests/env_test.sh
@@ -1,160 +1,161 @@
 #
 # Copyright (c) 2024 Klara, Inc.
 #
 # SPDX-License-Identifier: BSD-2-Clause
 #
 
 magic_words="Squeamish $$ Ossifrage"
 
 atf_test_case basic
 basic_head()
 {
 	atf_set "descr" "Basic test case"
 }
 basic_body()
 {
 	atf_check -o match:"^magic_words=${magic_words}\$" \
 		  env magic_words="${magic_words}"
 	export MAGIC_WORDS="${magic_words}"
 	atf_check -o match:"^MAGIC_WORDS=${magic_words}\$" \
 		  env
 	unset MAGIC_WORDS
 }
 
 atf_test_case unset
 unset_head()
 {
 	atf_set "descr" "Unset a variable"
 }
 unset_body()
 {
 	export MAGIC_WORDS="${magic_words}"
 	atf_check -o not-match:"^MAGIC_WORDS=" \
 		  env -u MAGIC_WORDS
 	unset MAGIC_WORDS
 }
 
 atf_test_case empty
 empty_head()
 {
 	atf_set "descr" "Empty environment"
 }
 empty_body()
 {
 	atf_check env -i
 }
 
 atf_test_case true
 true_head()
 {
 	atf_set "descr" "Run true"
 }
 true_body()
 {
 	atf_check env true
 }
 
 atf_test_case false
 false_head()
 {
 	atf_set "descr" "Run false"
 }
 false_body()
 {
 	atf_check -s exit:1 env false
 }
 
 atf_test_case false
 false_head()
 {
 	atf_set "descr" "Run false"
 }
 false_body()
 {
 	atf_check -s exit:1 env false
 }
 
 atf_test_case altpath
 altpath_head()
 {
 	atf_set "descr" "Use alternate path"
 }
 altpath_body()
 {
 	echo "echo ${magic_words}" >magic_words
 	chmod 0755 magic_words
 	atf_check -s exit:125 -e match:"must specify command" \
 		  env -P "${PWD}"
 	atf_check -s exit:127 -e match:"No such file" \
 		  env magic_words
 	atf_check -o inline:"${magic_words}\n" \
 		  env -P "${PWD}" magic_words
 }
 
 atf_test_case equal
 equal_head()
 {
 	atf_set "descr" "Command name contains equal sign"
 }
 equal_body()
 {
 	echo "echo ${magic_words}" >"magic=words"
 	chmod 0755 "magic=words"
 	atf_check -o match:"^${PWD}/magic=words$" \
 		  env "${PWD}/magic=words"
 	atf_check -s exit:125 -e match:"must specify command" \
 		  env -P "${PATH}:${PWD}" "magic=words"
 	atf_check -o inline:"${magic_words}\n" \
 		  env command "${PWD}/magic=words"
 	atf_check -o inline:"${magic_words}\n" \
 		  env PATH="${PATH}:${PWD}" command "magic=words"
 }
 
 atf_test_case chdir
 chdir_head()
 {
 	atf_set "descr" "Change working directory"
 }
 chdir_body()
 {
 	local subdir="dir.$$"
 	atf_check -o inline:"${PWD}\n" \
 		  env pwd
 	atf_check -s exit:125 -e match:"must specify command" \
 		  env -C "${subdir}"
 	atf_check -s exit:125 \
 		  -e match:"cannot change directory to '${subdir}':" \
 		  env -C "${subdir}" pwd
 	atf_check mkdir "${subdir}"
 	atf_check -o inline:"${PWD}/${subdir}\n" \
 		  env -C "${subdir}" pwd
 }
 
 atf_test_case stdout
 stdout_head()
 {
 	atf_set descr "Failure to write to stdout"
 }
 stdout_body()
 {
 	(
 		trap "" PIPE
+		sleep 1
 		env 2>stderr
 		echo $? >result
 	) | true
 	atf_check -o inline:"1\n" cat result
 	atf_check -o match:"stdout" cat stderr
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case basic
 	atf_add_test_case unset
 	atf_add_test_case empty
 	atf_add_test_case true
 	atf_add_test_case false
 	atf_add_test_case altpath
 	atf_add_test_case equal
 	atf_add_test_case chdir
 	atf_add_test_case stdout
 }