diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh
index 5064fe316e5e..59697ad37be2 100644
--- a/tests/sys/netpfil/pf/sctp.sh
+++ b/tests/sys/netpfil/pf/sctp.sh
@@ -1,190 +1,307 @@
 # $FreeBSD$
 #
 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 #
 # Copyright © 2023 Orange Business Services
 #
 # 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
 
 sctp_init()
 {
 	pft_init
 	if ! kldstat -q -m sctp; then
 		atf_skip "This test requires SCTP"
 	fi
 }
 
 atf_test_case "basic_v4" "cleanup"
 basic_v4_head()
 {
 	atf_set descr 'Basic SCTP connection over IPv4 passthrough'
 	atf_set require.user root
 }
 
 basic_v4_body()
 {
 	sctp_init
 
 	j="sctp:basic_v4"
 	epair=$(vnet_mkepair)
 
 	vnet_mkjail ${j}a ${epair}a
 	vnet_mkjail ${j}b ${epair}b
 
 	jexec ${j}a ifconfig ${epair}a 192.0.2.1/24 up
 	jexec ${j}b ifconfig ${epair}b 192.0.2.2/24 up
 	# Sanity check
 	atf_check -s exit:0 -o ignore \
 	    jexec ${j}a ping -c 1 192.0.2.2
 
 	jexec ${j}a pfctl -e
 	pft_set_rules ${j}a \
 		"block" \
 		"pass in proto sctp to port 1234"
 
 	echo "foo" | jexec ${j}a nc --sctp -N -l 1234 &
 
 	# Wait for the server to start
 	sleep 1
 
 	out=$(jexec ${j}b nc --sctp -N -w 3 192.0.2.1 1234)
 	if [ "$out" != "foo" ]; then
 		atf_fail "SCTP connection failed"
 	fi
 
 	# Now with scrub rules present, so normalization is done
 	pft_set_rules ${j}a \
 		"scrub on ${j}a" \
 		"block" \
 		"pass in proto sctp to port 1234"
 
 	echo "foo" | jexec ${j}a nc --sctp -N -l 1234 &
 	sleep 1
 
 	out=$(jexec ${j}b nc --sctp -N -w 3 192.0.2.1 1234)
 	if [ "$out" != "foo" ]; then
 		atf_fail "SCTP connection failed"
 	fi
 
 	# Now fail with a blocked port
 	echo "foo" | jexec ${j}a nc --sctp -N -l 1235 &
 	sleep 1
 
 	out=$(jexec ${j}b nc --sctp -N -w 3 192.0.2.1 1235)
 	if [ "$out" == "foo" ]; then
 		atf_fail "SCTP port block failed"
 	fi
 
 	# Now fail with a blocked port but passing source port
 	out=$(jexec ${j}b nc --sctp -N -w 3 -p 1234 192.0.2.1 1235)
 	if [ "$out" == "foo" ]; then
 		atf_fail "SCTP port block failed"
 	fi
 }
 
 basic_v4_cleanup()
 {
 	pft_cleanup
 }
 
 atf_test_case "basic_v6" "cleanup"
 basic_v6_head()
 {
 	atf_set descr 'Basic SCTP connection over IPv6'
 	atf_set require.user root
 }
 
 basic_v6_body()
 {
 	sctp_init
 
 	j="sctp:basic_v6"
 	epair=$(vnet_mkepair)
 
 	vnet_mkjail ${j}a ${epair}a
 	vnet_mkjail ${j}b ${epair}b
 
 	jexec ${j}a ifconfig ${epair}a inet6 2001:db8::a/64 up no_dad
 	jexec ${j}b ifconfig ${epair}b inet6 2001:db8::b/64 up no_dad
 
 	# Sanity check
 	atf_check -s exit:0 -o ignore \
 	    jexec ${j}a ping -6 -c 1 2001:db8::b
 
 	jexec ${j}a pfctl -e
 	pft_set_rules ${j}a \
 		"block proto sctp" \
 		"pass in proto sctp to port 1234"
 
 	echo "foo" | jexec ${j}a nc -6 --sctp -N -l 1234 &
 
 	# Wait for the server to start
 	sleep 1
 
 	out=$(jexec ${j}b nc --sctp -N -w 3 2001:db8::a 1234)
 	if [ "$out" != "foo" ]; then
 		atf_fail "SCTP connection failed"
 	fi
 
 	# Now with scrub rules present, so normalization is done
 	pft_set_rules ${j}a \
 		"scrub on ${j}a" \
 		"block proto sctp" \
 		"pass in proto sctp to port 1234"
 
 	echo "foo" | jexec ${j}a nc -6 --sctp -N -l 1234 &
 	sleep 1
 
 	out=$(jexec ${j}b nc --sctp -N -w 3 2001:db8::a 1234)
 	if [ "$out" != "foo" ]; then
 		atf_fail "SCTP connection failed"
 	fi
 
 	# Now fail with a blocked port
 	echo "foo" | jexec ${j}a nc -6 --sctp -N -l 1235 &
 	sleep 1
 
 	out=$(jexec ${j}b nc --sctp -N -w 3 2001:db8::a 1235)
 	if [ "$out" == "foo" ]; then
 		atf_fail "SCTP port block failed"
 	fi
 
 	# Now fail with a blocked port but passing source port
 	out=$(jexec ${j}b nc --sctp -N -w 3 -p 1234 2001:db8::a 1235)
 	if [ "$out" == "foo" ]; then
 		atf_fail "SCTP port block failed"
 	fi
 }
 
 basic_v6_cleanup()
 {
 	pft_cleanup
 }
 
+atf_test_case "abort_v4" "cleanup"
+abort_v4_head()
+{
+	atf_set descr 'Test sending ABORT messages'
+	atf_set require.user root
+}
+
+abort_v4_body()
+{
+	sctp_init
+
+	j="sctp:abort_v4"
+	epair=$(vnet_mkepair)
+
+	vnet_mkjail ${j}a ${epair}a
+	vnet_mkjail ${j}b ${epair}b
+
+	jexec ${j}a ifconfig ${epair}a 192.0.2.1/24 up
+	jexec ${j}b ifconfig ${epair}b 192.0.2.2/24 up
+
+	# Sanity check
+	atf_check -s exit:0 -o ignore \
+	    jexec ${j}a ping -c 1 192.0.2.2
+
+	jexec ${j}a pfctl -e
+	pft_set_rules ${j}a \
+		"block return in proto sctp to port 1234"
+
+	echo "foo" | jexec ${j}a nc --sctp -N -l 1234 &
+
+	# Wait for the server to start
+	sleep 1
+
+	# If we get the abort we'll exit immediately, if we don't timeout will
+	# stop nc.
+	out=$(jexec ${j}b timeout 3 nc --sctp -N 192.0.2.1 1234)
+	if [ $? -eq 124 ]; then
+		atf_fail 'Abort not received'
+	fi
+	if [ "$out" == "foo" ]; then
+		atf_fail "block failed entirely"
+	fi
+
+	# Without 'return' we will time out.
+	pft_set_rules ${j}a \
+		"block in proto sctp to port 1234"
+
+	out=$(jexec ${j}b timeout 3 nc --sctp -N 192.0.2.1 1234)
+	if [ $? -ne 124 ]; then
+		atf_fail 'Abort sent anyway?'
+	fi
+}
+
+abort_v4_cleanup()
+{
+	pft_cleanup
+}
+
+atf_test_case "abort_v6" "cleanup"
+abort_v4_head()
+{
+	atf_set descr 'Test sending ABORT messages over IPv6'
+	atf_set require.user root
+}
+
+abort_v6_body()
+{
+	sctp_init
+
+	j="sctp:abort_v6"
+	epair=$(vnet_mkepair)
+
+	vnet_mkjail ${j}a ${epair}a
+	vnet_mkjail ${j}b ${epair}b
+
+	jexec ${j}a ifconfig ${epair}a inet6 2001:db8::a/64 no_dad
+	jexec ${j}b ifconfig ${epair}b inet6 2001:db8::b/64 no_dad
+
+	# Sanity check
+	atf_check -s exit:0 -o ignore \
+	    jexec ${j}a ping -6 -c 1 2001:db8::b
+
+	jexec ${j}a pfctl -e
+	pft_set_rules ${j}a \
+		"block return in proto sctp to port 1234"
+
+	echo "foo" | jexec ${j}a nc -6 --sctp -N -l 1234 &
+
+	# Wait for the server to start
+	sleep 1
+
+	# If we get the abort we'll exit immediately, if we don't timeout will
+	# stop nc.
+	out=$(jexec ${j}b timeout 3 nc --sctp -N 2001:db8::a 1234)
+	if [ $? -eq 124 ]; then
+		atf_fail 'Abort not received'
+	fi
+	if [ "$out" == "foo" ]; then
+		atf_fail "block failed entirely"
+	fi
+
+	# Without 'return' we will time out.
+	pft_set_rules ${j}a \
+		"block in proto sctp to port 1234"
+
+	out=$(jexec ${j}b timeout 3 nc --sctp -N 2001:db8::a 1234)
+	if [ $? -ne 124 ]; then
+		atf_fail 'Abort sent anyway?'
+	fi
+}
+
+abort_v4_cleanup()
+{
+	pft_cleanup
+}
 
 atf_init_test_cases()
 {
 	atf_add_test_case "basic_v4"
 	atf_add_test_case "basic_v6"
+	atf_add_test_case "abort_v4"
+	atf_add_test_case "abort_v6"
 }