diff --git a/tests/sys/netipsec/tunnel/Makefile b/tests/sys/netipsec/tunnel/Makefile
index e80374940e95..4b8c8a21a5ac 100644
--- a/tests/sys/netipsec/tunnel/Makefile
+++ b/tests/sys/netipsec/tunnel/Makefile
@@ -1,19 +1,20 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 
 TESTSDIR=       ${TESTSBASE}/sys/netipsec/tunnel
 
 ATF_TESTS_SH+=	empty \
 		aes_cbc_128_hmac_sha1 \
 		aes_cbc_256_hmac_sha2_256 \
 		aes_gcm_128 \
 		aes_gcm_256 \
 		aesni_aes_cbc_128_hmac_sha1 \
 		aesni_aes_cbc_256_hmac_sha2_256 \
 		aesni_aes_gcm_128 \
-		aesni_aes_gcm_256
+		aesni_aes_gcm_256 \
+		chacha20_poly1305
 
 ${PACKAGE}FILES+=	utils.subr
 
 .include <bsd.test.mk>
diff --git a/tests/sys/netipsec/tunnel/chacha20_poly1305.sh b/tests/sys/netipsec/tunnel/chacha20_poly1305.sh
new file mode 100755
index 000000000000..0eb63e463edb
--- /dev/null
+++ b/tests/sys/netipsec/tunnel/chacha20_poly1305.sh
@@ -0,0 +1,43 @@
+# $FreeBSD$
+
+. $(atf_get_srcdir)/utils.subr
+
+atf_test_case "v4" "cleanup"
+v4_head()
+{
+	atf_set descr 'IPSec inet4 tunnel using chacha20-poly1305'
+	atf_set require.user root
+}
+
+v4_body()
+{
+	ist_test 4 chacha20-poly1305 "123456789012345678901234567890123456"
+}
+
+v4_cleanup()
+{
+	ist_cleanup
+}
+
+atf_test_case "v6" "cleanup"
+v6_head()
+{
+	atf_set descr 'IPSec inet6 tunnel using chacha20-poly1305'
+	atf_set require.user root
+}
+
+v6_body()
+{
+	ist_test 6 chacha20-poly1305 "123456789012345678901234567890123456"
+}
+
+v6_cleanup()
+{
+	ist_cleanup
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case "v4"
+	atf_add_test_case "v6"
+}