diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh
index 6ce84310ce84..99a0ca870c85 100755
--- a/tests/sys/netpfil/pf/nat.sh
+++ b/tests/sys/netpfil/pf/nat.sh
@@ -1,64 +1,65 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "exhaust" "cleanup"
 exhaust_head()
 {
 	atf_set descr 'Test exhausting the NAT pool'
 	atf_set require.user root
 }
 
 exhaust_body()
 {
 	pft_init
 
 	epair_nat=$(vnet_mkepair)
 	epair_echo=$(vnet_mkepair)
 
 	vnet_mkjail nat ${epair_nat}b ${epair_echo}a
 	vnet_mkjail echo ${epair_echo}b
 
 	ifconfig ${epair_nat}a 192.0.2.2/24 up
 	route add -net 198.51.100.0/24 192.0.2.1
 
 	jexec nat ifconfig ${epair_nat}b 192.0.2.1/24 up
 	jexec nat ifconfig ${epair_echo}a 198.51.100.1/24 up
 	jexec nat sysctl net.inet.ip.forwarding=1
 
 	jexec echo ifconfig ${epair_echo}b 198.51.100.2/24 up
-	jexec echo /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf
+	jexec echo /usr/sbin/inetd -p inetd-echo.pid $(atf_get_srcdir)/echo_inetd.conf
 
 	# Enable pf!
 	jexec nat pfctl -e
 	pft_set_rules nat \
 		"nat pass on ${epair_echo}a inet from 192.0.2.0/24 to any -> (${epair_echo}a) port 30000:30001 sticky-address"
 
 	# Sanity check
 	atf_check -s exit:0 -o ignore ping -c 3 198.51.100.2
 
 	echo "foo" | nc -N 198.51.100.2 7
 	echo "foo" | nc -N 198.51.100.2 7
 
 	# This one will fail, but that's expected
 	echo "foo" | nc -N 198.51.100.2 7 &
 
 	sleep 1
 
 	# If the kernel is stuck in pf_get_sport() this will not succeed either.
 	timeout 2 jexec nat pfctl -sa
 	if [ $? -eq 124 ]; then
 		# Timed out
 		atf_fail "pfctl timeout"
 	fi
 }
 
 exhaust_cleanup()
 {
+	rm -f inetd-echo.pid
 	pft_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "exhaust"
 }
diff --git a/tests/sys/netpfil/pf/synproxy.sh b/tests/sys/netpfil/pf/synproxy.sh
index bb4161f58d42..6203723adbe8 100755
--- a/tests/sys/netpfil/pf/synproxy.sh
+++ b/tests/sys/netpfil/pf/synproxy.sh
@@ -1,59 +1,60 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "synproxy" "cleanup"
 synproxy_head()
 {
 	atf_set descr 'Basic synproxy test'
 	atf_set require.user root
 }
 
 synproxy_body()
 {
 	pft_init
 
 	epair=$(vnet_mkepair)
 	ifconfig ${epair}a 192.0.2.1/24 up
 	route add -net 198.51.100.0/24 192.0.2.2
 
 	link=$(vnet_mkepair)
 
 	vnet_mkjail alcatraz ${epair}b ${link}a
 	jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up
 	jexec alcatraz ifconfig ${link}a 198.51.100.1/24 up
 	jexec alcatraz sysctl net.inet.ip.forwarding=1
 
 	vnet_mkjail singsing ${link}b
 	jexec singsing ifconfig ${link}b 198.51.100.2/24 up
 	jexec singsing route add default 198.51.100.1
 
-	jexec singsing /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf
+	jexec singsing /usr/sbin/inetd -p inetd-singsing.pid $(atf_get_srcdir)/echo_inetd.conf
 
 	jexec alcatraz pfctl -e
 	pft_set_rules alcatraz "set fail-policy return" \
 		"scrub in all fragment reassemble" \
 		"pass out quick on ${epair}b all no state allow-opts" \
 		"pass in quick on ${epair}b proto tcp from any to any port 7 synproxy state" \
 		"pass in quick on ${epair}b all no state"
 
 	# Sanity check, can we ping singing
 	atf_check -s exit:0 -o ignore ping -c 1 198.51.100.2
 
 	# Check that we can talk to the singsing jail, after synproxying
 	reply=$(echo ping | nc -N 198.51.100.2 7)
 	if [ "${reply}" != "ping" ];
 	then
 		atf_fail "echo failed"
 	fi
 }
 
 synproxy_cleanup()
 {
+	rm -f inetd-singsing.pid
 	pft_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "synproxy"
 }