Index: head/tools/regression/usr.bin/pkill/pgrep-F.t
===================================================================
--- head/tools/regression/usr.bin/pkill/pgrep-F.t	(revision 149435)
+++ head/tools/regression/usr.bin/pkill/pgrep-F.t	(revision 149436)
@@ -1,24 +1,23 @@
 #!/bin/sh
 # $FreeBSD$
 
 base=`basename $0`
 
 echo "1..1"
 
 name="pgrep -F <pidfile>"
 pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1
 sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 ln -sf /bin/sleep $sleep
-$sleep 5 &
+daemon -p $pidfile $sleep 5
 sleep 0.3
-chpid=$!
-echo $chpid > $pidfile
+chpid=`cat $pidfile`
 pid=`pgrep -f -F $pidfile $sleep`
 if [ "$pid" = "$chpid" ]; then
 	echo "ok - $name"
 else
 	echo "not ok - $name"
 fi
-kill $chpid
+kill "$chpid"
 rm -f $pidfile
 rm -f $sleep
Index: head/tools/regression/usr.bin/pkill/pkill-F.t
===================================================================
--- head/tools/regression/usr.bin/pkill/pkill-F.t	(revision 149435)
+++ head/tools/regression/usr.bin/pkill/pkill-F.t	(revision 149436)
@@ -1,27 +1,26 @@
 #!/bin/sh
 # $FreeBSD$
 
 base=`basename $0`
 
 echo "1..1"
 
 name="pkill -F <pidfile>"
 pidfile=`mktemp /tmp/$base.XXXXXX` || exit 1
 sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 ln -sf /bin/sleep $sleep
-$sleep 5 &
+daemon -p $pidfile $sleep 5
 sleep 0.3
-echo $! > $pidfile
 pkill -f -F $pidfile $sleep
 ec=$?
 case $ec in
 0)
 	echo "ok - $name"
 	;;
 *)
 	echo "not ok - $name"
 	;;
 esac
 
 rm -f $pidfile
 rm -f $sleep