--- /dev/null
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+ALL_TESTS="
+       ping_ipv4
+       ping_ipv6
+"
+NUM_NETIFS=4
+source lib.sh
+
+h1_create()
+{
+       simple_if_init $h1 192.0.2.1/28 2001:db8:1::1/64
+       ip -4 route add 192.0.2.128/28 vrf v$h1 nexthop via 192.0.2.2
+       ip -6 route add 2001:db8:2::/64 vrf v$h1 nexthop via 2001:db8:1::2
+}
+
+h1_destroy()
+{
+       ip -6 route del 2001:db8:2::/64 vrf v$h1
+       ip -4 route del 192.0.2.128/28 vrf v$h1
+       simple_if_fini $h1 192.0.2.1/28 2001:db8:1::1/64
+}
+
+h2_create()
+{
+       simple_if_init $h2 192.0.2.130/28 2001:db8:2::2/64
+       ip -4 route add 192.0.2.0/28 vrf v$h2 nexthop via 192.0.2.129
+       ip -6 route add 2001:db8:1::/64 vrf v$h2 nexthop via 2001:db8:2::1
+}
+
+h2_destroy()
+{
+       ip -6 route del 2001:db8:1::/64 vrf v$h2
+       ip -4 route del 192.0.2.0/28 vrf v$h2
+       simple_if_fini $h2 192.0.2.130/28 2001:db8:2::2/64
+}
+
+router_create()
+{
+       ip link add name br1 type bridge vlan_filtering 1
+       ip link set dev br1 up
+
+       ip link set dev $swp1 master br1
+       ip link set dev $swp1 up
+       __addr_add_del br1 add 192.0.2.2/28 2001:db8:1::2/64
+
+       ip link set dev $swp2 up
+       __addr_add_del $swp2 add 192.0.2.129/28 2001:db8:2::1/64
+}
+
+router_destroy()
+{
+       __addr_add_del $swp2 del 192.0.2.129/28 2001:db8:2::1/64
+       ip link set dev $swp2 down
+
+       __addr_add_del br1 del 192.0.2.2/28 2001:db8:1::2/64
+       ip link set dev $swp1 down
+       ip link set dev $swp1 nomaster
+
+       ip link del dev br1
+}
+
+setup_prepare()
+{
+       h1=${NETIFS[p1]}
+       swp1=${NETIFS[p2]}
+
+       swp2=${NETIFS[p3]}
+       h2=${NETIFS[p4]}
+
+       vrf_prepare
+
+       h1_create
+       h2_create
+
+       router_create
+
+       forwarding_enable
+}
+
+cleanup()
+{
+       pre_cleanup
+
+       forwarding_restore
+
+       router_destroy
+
+       h2_destroy
+       h1_destroy
+
+       vrf_cleanup
+}
+
+ping_ipv4()
+{
+       ping_test $h1 192.0.2.130
+}
+
+ping_ipv6()
+{
+       ping6_test $h1 2001:db8:2::2
+}
+
+trap cleanup EXIT
+
+setup_prepare
+setup_wait
+
+tests_run
+
+exit $EXIT_STATUS
 
--- /dev/null
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+ALL_TESTS="
+       ping_ipv4
+       ping_ipv6
+       vlan
+"
+NUM_NETIFS=4
+source lib.sh
+
+h1_create()
+{
+       simple_if_init $h1
+       vlan_create $h1 555 v$h1 192.0.2.1/28 2001:db8:1::1/64
+       ip -4 route add 192.0.2.128/28 vrf v$h1 nexthop via 192.0.2.2
+       ip -6 route add 2001:db8:2::/64 vrf v$h1 nexthop via 2001:db8:1::2
+}
+
+h1_destroy()
+{
+       ip -6 route del 2001:db8:2::/64 vrf v$h1
+       ip -4 route del 192.0.2.128/28 vrf v$h1
+       vlan_destroy $h1 555
+       simple_if_fini $h1
+}
+
+h2_create()
+{
+       simple_if_init $h2 192.0.2.130/28 2001:db8:2::2/64
+       ip -4 route add 192.0.2.0/28 vrf v$h2 nexthop via 192.0.2.129
+       ip -6 route add 2001:db8:1::/64 vrf v$h2 nexthop via 2001:db8:2::1
+}
+
+h2_destroy()
+{
+       ip -6 route del 2001:db8:1::/64 vrf v$h2
+       ip -4 route del 192.0.2.0/28 vrf v$h2
+       simple_if_fini $h2 192.0.2.130/28
+}
+
+router_create()
+{
+       ip link add name br1 type bridge vlan_filtering 1
+       ip link set dev br1 up
+
+       ip link set dev $swp1 master br1
+       ip link set dev $swp1 up
+
+       bridge vlan add dev br1 vid 555 self pvid untagged
+       bridge vlan add dev $swp1 vid 555
+
+       __addr_add_del br1 add 192.0.2.2/28 2001:db8:1::2/64
+
+       ip link set dev $swp2 up
+       __addr_add_del $swp2 add 192.0.2.129/28 2001:db8:2::1/64
+}
+
+router_destroy()
+{
+       __addr_add_del $swp2 del 192.0.2.129/28 2001:db8:2::1/64
+       ip link set dev $swp2 down
+
+       __addr_add_del br1 del 192.0.2.2/28 2001:db8:1::2/64
+       ip link set dev $swp1 down
+       ip link set dev $swp1 nomaster
+
+       ip link del dev br1
+}
+
+setup_prepare()
+{
+       h1=${NETIFS[p1]}
+       swp1=${NETIFS[p2]}
+
+       swp2=${NETIFS[p3]}
+       h2=${NETIFS[p4]}
+
+       vrf_prepare
+
+       h1_create
+       h2_create
+
+       router_create
+
+       forwarding_enable
+}
+
+cleanup()
+{
+       pre_cleanup
+
+       forwarding_restore
+
+       router_destroy
+
+       h2_destroy
+       h1_destroy
+
+       vrf_cleanup
+}
+
+vlan()
+{
+       RET=0
+
+       bridge vlan add dev br1 vid 333 self
+       check_err $? "Can't add a non-PVID VLAN"
+       bridge vlan del dev br1 vid 333 self
+       check_err $? "Can't remove a non-PVID VLAN"
+
+       log_test "vlan"
+}
+
+ping_ipv4()
+{
+       ping_test $h1 192.0.2.130
+}
+
+ping_ipv6()
+{
+       ping6_test $h1 2001:db8:2::2
+}
+
+trap cleanup EXIT
+
+setup_prepare
+setup_wait
+
+tests_run
+
+exit $EXIT_STATUS