diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py
index 916a019d2f4a..de673f026c77 100644
--- a/tests/sys/netpfil/common/pft_ping.py
+++ b/tests/sys/netpfil/common/pft_ping.py
@@ -1,306 +1,332 @@
 #!/usr/bin/env python3
 #
 # SPDX-License-Identifier: BSD-2-Clause
 #
 # Copyright (c) 2017 Kristof Provost <kp@FreeBSD.org>
 #
 # 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 AUTHOR 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 AUTHOR 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.
 #
 
 import argparse
 import scapy.all as sp
 import socket
 import sys
 from sniffer import Sniffer
 
 PAYLOAD_MAGIC = bytes.fromhex('42c0ffee')
 
 dup_found = 0
 
 def check_dup(args, packet):
 	"""
 	Verify that this is an ICMP packet, and that we only see one
 	"""
 	global dup_found
 
 	icmp = packet.getlayer(sp.ICMP)
 	if not icmp:
 		return False
 
 	raw = packet.getlayer(sp.Raw)
 	if not raw:
 		return False
 	if raw.load != PAYLOAD_MAGIC:
 		return False
 
 	dup_found = dup_found + 1
 	return False
 
 def check_ping_request(args, packet):
 	if args.ip6:
 		return check_ping6_request(args, packet)
 	else:
 		return check_ping4_request(args, packet)
 
 def check_ping4_request(args, packet):
 	"""
 	Verify that the packet matches what we'd have sent
 	"""
 	dst_ip = args.to[0]
 
 	ip = packet.getlayer(sp.IP)
 	if not ip:
 		return False
 	if ip.dst != dst_ip:
 		return False
 
 	icmp = packet.getlayer(sp.ICMP)
 	if not icmp:
 		return False
 	if sp.icmptypes[icmp.type] != 'echo-request':
 		return False
 
 	raw = packet.getlayer(sp.Raw)
 	if not raw:
 		return False
 	if raw.load != PAYLOAD_MAGIC:
 		return False
 
 	# Wait to check expectations until we've established this is the packet we
 	# sent.
 	if args.expect_tos:
 		if ip.tos != int(args.expect_tos[0]):
 			print("Unexpected ToS value %d, expected %d" \
 				% (ip.tos, int(args.expect_tos[0])))
 			return False
 
 	return True
 
 def check_ping6_request(args, packet):
 	"""
 	Verify that the packet matches what we'd have sent
 	"""
 	dst_ip = args.to[0]
 
 	ip = packet.getlayer(sp.IPv6)
 	if not ip:
 		return False
 	if ip.dst != dst_ip:
 		return False
 
 	icmp = packet.getlayer(sp.ICMPv6EchoRequest)
 	if not icmp:
 		return False
 	if icmp.data != PAYLOAD_MAGIC:
 		return False
 
 	return True
 
 def check_ping_reply(args, packet):
-	return check_ping4_reply(args, packet)
+	if args.ip6:
+		return check_ping6_reply(args, packet)
+	else:
+		return check_ping4_reply(args, packet)
 
 def check_ping4_reply(args, packet):
 	"""
 	Check that this is a reply to the ping request we sent
 	"""
 	dst_ip = args.to[0]
 
 	ip = packet.getlayer(sp.IP)
 	if not ip:
 		return False
 	if ip.src != dst_ip:
 		return False
 
 	icmp = packet.getlayer(sp.ICMP)
 	if not icmp:
 		return False
 	if sp.icmptypes[icmp.type] != 'echo-reply':
 		return False
 
 	raw = packet.getlayer(sp.Raw)
 	if not raw:
 		return False
 	if raw.load != PAYLOAD_MAGIC:
 		return False
 
 	return True
 
+def check_ping6_reply(args, packet):
+	"""
+	Check that this is a reply to the ping request we sent
+	"""
+	dst_ip = args.to[0]
+
+	ip = packet.getlayer(sp.IPv6)
+	if not ip:
+		return False
+	if ip.src != dst_ip:
+		return False
+
+	icmp = packet.getlayer(sp.ICMPv6EchoReply)
+	if not icmp:
+		print("No echo reply!")
+		return False
+
+	if icmp.data != PAYLOAD_MAGIC:
+		print("data mismatch")
+		return False
+
+	return True
+
 def ping(send_if, dst_ip, args):
 	ether = sp.Ether()
 	ip = sp.IP(dst=dst_ip)
 	icmp = sp.ICMP(type='echo-request')
 	raw = sp.raw(PAYLOAD_MAGIC)
 
 	if args.send_tos:
 		ip.tos = int(args.send_tos[0])
 
 	if args.fromaddr:
 		ip.src = args.fromaddr[0]
 
 	req = ether / ip / icmp / raw
 	sp.sendp(req, iface=send_if, verbose=False)
 
 def ping6(send_if, dst_ip, args):
 	ether = sp.Ether()
 	ip6 = sp.IPv6(dst=dst_ip)
 	icmp = sp.ICMPv6EchoRequest(data=sp.raw(PAYLOAD_MAGIC))
 
 	if args.fromaddr:
 		ip.src = args.fromaddr[0]
 
 	req = ether / ip6 / icmp
 	sp.sendp(req, iface=send_if, verbose=False)
 
 def check_tcpsyn(args, packet):
 	dst_ip = args.to[0]
 
 	ip = packet.getlayer(sp.IP)
 	if not ip:
 		return False
 	if ip.dst != dst_ip:
 		return False
 
 	tcp = packet.getlayer(sp.TCP)
 	if not tcp:
 		return False
 
 	# Verify IP checksum
 	chksum = ip.chksum
 	ip.chksum = None
 	new_chksum = sp.IP(sp.raw(ip)).chksum
 	if chksum != new_chksum:
 		print("Expected IP checksum %x but found %x\n" % (new_cshkum, chksum))
 		return False
 
 	# Verify TCP checksum
 	chksum = tcp.chksum
 	packet_raw = sp.raw(packet)
 	tcp.chksum = None
 	newpacket = sp.Ether(sp.raw(packet[sp.Ether]))
 	new_chksum = newpacket[sp.TCP].chksum
 	if chksum != new_chksum:
 		print("Expected TCP checksum %x but found %x\n" % (new_chksum, chksum))
 		return False
 
 	return True
 
 def tcpsyn(send_if, dst_ip, args):
 	opts=[('Timestamp', (1, 1)), ('MSS', 1280)]
 
 	if args.tcpopt_unaligned:
 		opts = [('NOP', 0 )] + opts
 
 	ether = sp.Ether()
 	ip = sp.IP(dst=dst_ip)
 	tcp = sp.TCP(dport=666, flags='S', options=opts)
 
 	req = ether / ip / tcp
 	sp.sendp(req, iface=send_if, verbose=False)
 
 
 def main():
 	parser = argparse.ArgumentParser("pft_ping.py",
 		description="Ping test tool")
 	parser.add_argument('--sendif', nargs=1,
 		required=True,
 		help='The interface through which the packet(s) will be sent')
 	parser.add_argument('--recvif', nargs=1,
 		help='The interface on which to expect the ICMP echo request')
 	parser.add_argument('--replyif', nargs=1,
 		help='The interface on which to expect the ICMP echo response')
 	parser.add_argument('--checkdup', nargs=1,
 		help='The interface on which to expect the duplicated ICMP packets')
 	parser.add_argument('--ip6', action='store_true',
 		help='Use IPv6')
 	parser.add_argument('--to', nargs=1,
 		required=True,
 		help='The destination IP address for the ICMP echo request')
 	parser.add_argument('--fromaddr', nargs=1,
 		help='The source IP address for the ICMP echo request')
 
 	# TCP options
 	parser.add_argument('--tcpsyn', action='store_true',
 			help='Send a TCP SYN packet')
 	parser.add_argument('--tcpopt_unaligned', action='store_true',
 			help='Include unaligned TCP options')
 
 	# Packet settings
 	parser.add_argument('--send-tos', nargs=1,
 		help='Set the ToS value for the transmitted packet')
 
 	# Expectations
 	parser.add_argument('--expect-tos', nargs=1,
 		help='The expected ToS value in the received packet')
 
 	args = parser.parse_args()
 
 	# We may not have a default route. Tell scapy where to start looking for routes
 	sp.conf.iface6 = args.sendif[0]
 
 	sniffer = None
 	if not args.recvif is None:
 		checkfn=check_ping_request
 		if args.tcpsyn:
 			checkfn=check_tcpsyn
 
 		sniffer = Sniffer(args, checkfn)
 
 	replysniffer = None
 	if not args.replyif is None:
 		checkfn=check_ping_reply
 		replysniffer = Sniffer(args, checkfn, recvif=args.replyif[0])
 
 	dupsniffer = None
 	if args.checkdup is not None:
 		dupsniffer = Sniffer(args, check_dup, recvif=args.checkdup[0])
 
 	if args.tcpsyn:
 		tcpsyn(args.sendif[0], args.to[0], args)
 	else:
 		if args.ip6:
 			ping6(args.sendif[0], args.to[0], args)
 		else:
 			ping(args.sendif[0], args.to[0], args)
 
 	if dupsniffer:
 		dupsniffer.join()
 		if dup_found != 1:
 			sys.exit(1)
 
 	if sniffer:
 		sniffer.join()
 
 		if sniffer.foundCorrectPacket:
 			sys.exit(0)
 		else:
 			sys.exit(1)
 
 	if replysniffer:
 		replysniffer.join()
 
 		if replysniffer.foundCorrectPacket:
 			sys.exit(0)
 		else:
 			sys.exit(1)
 
 if __name__ == '__main__':
 	main()
diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh
index 994ce130a814..d54858d5452c 100644
--- a/tests/sys/netpfil/pf/killstate.sh
+++ b/tests/sys/netpfil/pf/killstate.sh
@@ -1,175 +1,248 @@
 # $FreeBSD$
 #
 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 #
 # Copyright (c) 2021 Rubicon Communications, LLC (Netgate)
 #
 # 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 AUTHOR 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 AUTHOR 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_get_srcdir)/utils.subr
 
 common_dir=$(atf_get_srcdir)/../common
 
 atf_test_case "v4" "cleanup"
 v4_head()
 {
 	atf_set descr 'Test killing states by IPv4 address'
 	atf_set require.user root
 	atf_set require.progs scapy
 }
 
 v4_body()
 {
 	pft_init
 
 	epair=$(vnet_mkepair)
 	ifconfig ${epair}a 192.0.2.1/24 up
 
 	vnet_mkjail alcatraz ${epair}b
 	jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up
 	jexec alcatraz pfctl -e
 
 	pft_set_rules alcatraz "block all" \
 		"pass in proto icmp"
 
 	# Sanity check & establish state
 	# Note: use pft_ping so we always use the same ID, so pf considers all
 	# echo requests part of the same flow.
 	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 
 	# Change rules to now deny the ICMP traffic
 	pft_set_rules noflush alcatraz "block all"
 
 	# Established state means we can still ping alcatraz
 	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 
 	# Killing with the wrong IP doesn't affect our state
 	jexec alcatraz pfctl -k 192.0.2.3
 
 	# So we can still ping
 	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 
 	# Killing with one correct address and one incorrect doesn't kill the state
 	jexec alcatraz pfctl -k 192.0.2.1 -k 192.0.2.3
 
 	# So we can still ping
 	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 
 	# Killing with correct address does remove the state
 	jexec alcatraz pfctl -k 192.0.2.1
 
 	# Now the ping fails
 	atf_check -s exit:1 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 }
 
 v4_cleanup()
 {
 	pft_cleanup
 }
 
+atf_test_case "v6" "cleanup"
+v6_head()
+{
+	atf_set descr 'Test killing states by IPv6 address'
+	atf_set require.user root
+	atf_set require.progs scapy
+}
+
+v6_body()
+{
+	pft_init
+
+	epair=$(vnet_mkepair)
+	ifconfig ${epair}a inet6 2001:db8::1/64 up no_dad
+
+	vnet_mkjail alcatraz ${epair}b
+	jexec alcatraz ifconfig ${epair}b inet6 2001:db8::2/64 up no_dad
+	jexec alcatraz pfctl -e
+
+	pft_set_rules alcatraz "block all" \
+		"pass in proto icmp6"
+
+	# Sanity check & establish state
+	# Note: use pft_ping so we always use the same ID, so pf considers all
+	# echo requests part of the same flow.
+	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
+		--ip6 \
+		--sendif ${epair}a \
+		--to 2001:db8::2 \
+		--replyif ${epair}a
+
+	# Change rules to now deny the ICMP traffic
+	pft_set_rules noflush alcatraz "block all"
+
+	# Established state means we can still ping alcatraz
+	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
+		--ip6 \
+		--sendif ${epair}a \
+		--to 2001:db8::2 \
+		--replyif ${epair}a
+
+	# Killing with the wrong IP doesn't affect our state
+	jexec alcatraz pfctl -k 2001:db8::3
+	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
+		--ip6 \
+		--sendif ${epair}a \
+		--to 2001:db8::2 \
+		--replyif ${epair}a
+
+	# Killing with one correct address and one incorrect doesn't kill the state
+	jexec alcatraz pfctl -k 2001:db8::1 -k 2001:db8::3
+	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
+		--ip6 \
+		--sendif ${epair}a \
+		--to 2001:db8::2 \
+		--replyif ${epair}a
+
+	# Killing with correct address does remove the state
+	jexec alcatraz pfctl -k 2001:db8::1
+	atf_check -s exit:1 -o ignore ${common_dir}/pft_ping.py \
+		--ip6 \
+		--sendif ${epair}a \
+		--to 2001:db8::2 \
+		--replyif ${epair}a
+
+}
+
+v6_cleanup()
+{
+	pft_cleanup
+}
+
 atf_test_case "label" "cleanup"
 label_head()
 {
 	atf_set descr 'Test killing states by label'
 	atf_set require.user root
 	atf_set require.progs scapy
 }
 
 label_body()
 {
 	pft_init
 
 	epair=$(vnet_mkepair)
 	ifconfig ${epair}a 192.0.2.1/24 up
 
 	vnet_mkjail alcatraz ${epair}b
 	jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up
 	jexec alcatraz pfctl -e
 
 	pft_set_rules alcatraz "block all" \
 		"pass in proto tcp label bar" \
 		"pass in proto icmp label foo"
 
 	# Sanity check & establish state
 	# Note: use pft_ping so we always use the same ID, so pf considers all
 	# echo requests part of the same flow.
 	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 
 	# Change rules to now deny the ICMP traffic
 	pft_set_rules noflush alcatraz "block all"
 
 	# Established state means we can still ping alcatraz
 	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 
 	# Killing a label on a different rules keeps the state
 	jexec alcatraz pfctl -k label -k bar
 	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 
 	# Killing a non-existing label keeps the state
 	jexec alcatraz pfctl -k label -k baz
 	atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 
 	# Killing the correct label kills the state
 	jexec alcatraz pfctl -k label -k foo
 	atf_check -s exit:1 -o ignore ${common_dir}/pft_ping.py \
 		--sendif ${epair}a \
 		--to 192.0.2.2 \
 		--replyif ${epair}a
 }
 
 label_cleanup()
 {
 	pft_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "v4"
+	atf_add_test_case "v6"
 	atf_add_test_case "label"
 }