diff --git a/test/test_vxlan.py b/src/vnet/vxlan/test/test_vxlan.py
similarity index 100%
rename from test/test_vxlan.py
rename to src/vnet/vxlan/test/test_vxlan.py
diff --git a/test/test_vxlan6.py b/src/vnet/vxlan/test/test_vxlan6.py
similarity index 100%
rename from test/test_vxlan6.py
rename to src/vnet/vxlan/test/test_vxlan6.py
diff --git a/test/test_vxlan_gbp.py b/src/vnet/vxlan/test/test_vxlan_gbp.py
similarity index 100%
rename from test/test_vxlan_gbp.py
rename to src/vnet/vxlan/test/test_vxlan_gbp.py
diff --git a/test/test_vxlan_gpe.py b/src/vnet/vxlan/test/test_vxlan_gpe.py
similarity index 100%
rename from test/test_vxlan_gpe.py
rename to src/vnet/vxlan/test/test_vxlan_gpe.py
diff --git a/test/vpp_vxlan_gbp_tunnel.py b/src/vnet/vxlan/test/vpp_vxlan_gbp_tunnel.py
similarity index 100%
rename from test/vpp_vxlan_gbp_tunnel.py
rename to src/vnet/vxlan/test/vpp_vxlan_gbp_tunnel.py
diff --git a/test/vpp_vxlan_tunnel.py b/src/vnet/vxlan/test/vpp_vxlan_tunnel.py
similarity index 100%
rename from test/vpp_vxlan_tunnel.py
rename to src/vnet/vxlan/test/vpp_vxlan_tunnel.py