diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile
index 77c3c833a186..0a6f2a5ea292 100644
--- a/tests/sys/net/Makefile
+++ b/tests/sys/net/Makefile
@@ -1,29 +1,30 @@
 # $FreeBSD$
 
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/sys/net
 BINDIR=		${TESTSDIR}
 
 ATF_TESTS_C+=	if_epair
 ATF_TESTS_SH+=	if_bridge_test
 ATF_TESTS_SH+=	if_clone_test
 ATF_TESTS_SH+=	if_lagg_test
 ATF_TESTS_SH+=	if_tun_test
+ATF_TESTS_SH+=	if_vlan
 
 # The tests are written to be run in parallel, but doing so leads to random
 # panics.  I think it's because the kernel's list of interfaces isn't properly
 # locked.
 TEST_METADATA+=	is_exclusive=true
 
 ${PACKAGE}FILES+=	\
 		stp.py
 
 ${PACKAGE}FILESMODE_stp.py=		0555
 
 MAN=
 PROGS+=		randsleep
 
 WARNS?=		6
 
 .include <bsd.test.mk>
diff --git a/tests/sys/net/if_vlan.sh b/tests/sys/net/if_vlan.sh
new file mode 100755
index 000000000000..60b799b25675
--- /dev/null
+++ b/tests/sys/net/if_vlan.sh
@@ -0,0 +1,42 @@
+# $FreeBSD$
+
+. $(atf_get_srcdir)/../common/vnet.subr
+
+atf_test_case "basic" "cleanup"
+basic_head()
+{
+	atf_set descr 'Basic VLAN test'
+	atf_set require.user root
+}
+
+basic_body()
+{
+	vnet_init
+
+	epair_vlan=$(vnet_mkepair)
+
+	vnet_mkjail alcatraz ${epair_vlan}a
+	vnet_mkjail singsing ${epair_vlan}b
+
+	vlan0=$(jexec alcatraz ifconfig vlan create vlandev ${epair_vlan}a \
+		vlan 42)
+	jexec alcatraz ifconfig ${epair_vlan}a up
+	jexec alcatraz ifconfig ${vlan0} 10.0.0.1/24 up
+
+	vlan1=$(jexec singsing ifconfig vlan create vlandev ${epair_vlan}b \
+		vlan 42)
+	jexec singsing ifconfig ${epair_vlan}b up
+	jexec singsing ifconfig ${vlan1} 10.0.0.2/24 up
+
+	atf_check -s exit:0 -o ignore jexec singsing ping -c 1 10.0.0.1
+}
+
+basic_cleanup()
+{
+	vnet_cleanup
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case "basic"
+}