diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile
index 8444c92fb8d5..38548336377a 100644
--- a/tests/sys/netpfil/pf/Makefile
+++ b/tests/sys/netpfil/pf/Makefile
@@ -1,90 +1,91 @@
 PACKAGE=	tests
 
 TESTSDIR=       ${TESTSBASE}/sys/netpfil/pf
 BINDIR=		${TESTSDIR}
 TESTS_SUBDIRS+=	ioctl
 
 ATF_TESTS_SH+=	altq \
 		anchor \
 		debug \
 		divert-to \
 		dup \
 		ether \
 		forward \
 		fragmentation_compat \
 		fragmentation_pass \
 		fragmentation_no_reassembly \
 		get_state \
 		icmp \
 		icmp6 \
 		if_enc \
 		limits \
 		loginterface \
 		killstate \
 		macro \
 		map_e \
 		match \
+		max_states \
 		mbuf \
 		modulate \
 		names \
 		nat \
 		pass_block \
 		pflog \
 		pflow \
 		pfsync	\
 		prio \
 		proxy \
 		rdr \
 		ridentifier \
 		route_to \
 		rtable \
 		rules_counter \
 		scrub_compat \
 		scrub_pass \
 		sctp \
 		set_skip \
 		set_tos \
 		src_track \
 		status \
 		syncookie \
 		synproxy \
 		table \
 		tcp \
 		tos
 
 ATF_TESTS_PYTEST+=	frag6.py
 ATF_TESTS_PYTEST+=	icmp.py
 ATF_TESTS_PYTEST+=	nat66.py
 ATF_TESTS_PYTEST+=	sctp.py
 
 # Allow tests to run in parallel in their own jails
 TEST_METADATA+= execenv="jail"
 TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets"
 
 PROGS=	divapp
 
 ${PACKAGE}FILES+=	CVE-2019-5597.py \
 			CVE-2019-5598.py \
 			daytime_inetd.conf \
 			echo_inetd.conf \
 			fragcommon.py \
 			frag-overindex.py \
 			frag-overlimit.py \
 			frag-overreplace.py \
 			pfsync_defer.py \
 			pft_ether.py \
 			pft_read_ipfix.py \
 			rdr-srcport.py \
 			utils.subr
 
 ${PACKAGE}FILESMODE_CVE-2019-5597.py=	0555
 ${PACKAGE}FILESMODE_CVE-2019-5598.py=	0555
 ${PACKAGE}FILESMODE_fragcommon.py=	0555
 ${PACKAGE}FILESMODE_frag-overindex.py=	0555
 ${PACKAGE}FILESMODE_frag-overlimit.py=	0555
 ${PACKAGE}FILESMODE_frag-overreplace.py=	0555
 ${PACKAGE}FILESMODE_pfsync_defer.py=	0555
 ${PACKAGE}FILESMODE_pft_ether.py=	0555
 ${PACKAGE}FILESMODE_pft_read_ipfix.py=	0555
 
 .include <bsd.test.mk>
diff --git a/tests/sys/netpfil/pf/max_states.sh b/tests/sys/netpfil/pf/max_states.sh
new file mode 100755
index 000000000000..677d6f473d97
--- /dev/null
+++ b/tests/sys/netpfil/pf/max_states.sh
@@ -0,0 +1,61 @@
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2024 Kajetan Staszkiewicz <vegeta@tuxpowered.net>
+#
+# 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
+
+
+max_states_head()
+{
+	atf_set descr 'Max states per rule'
+	atf_set require.user root
+}
+
+max_states_body()
+{
+	setup_router_dummy_ipv6
+
+	pft_set_rules router \
+		"block" \
+		"pass quick inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \
+		"pass in  on ${epair_tester}b keep state (max 3)" \
+		"pass out on ${epair_server}a keep state"
+
+	# The exact limit is off by 1
+	ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-sport=4201
+	ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-sport=4202
+	ping_dummy_check_request exit:1 --ping-type=tcpsyn --send-sport=4203
+}
+
+max_states_cleanup()
+{
+	pft_cleanup
+}
+
+
+atf_init_test_cases()
+{
+	atf_add_test_case "max_states"
+}