diff --git a/test_data/of13/bsn_vport_create_request__l2gre.data b/test_data/of13/bsn_virtual_port_create_request__l2gre.data
similarity index 73%
rename from test_data/of13/bsn_vport_create_request__l2gre.data
rename to test_data/of13/bsn_virtual_port_create_request__l2gre.data
index 95f4a7b..b5fd5fa 100644
--- a/test_data/of13/bsn_vport_create_request__l2gre.data
+++ b/test_data/of13/bsn_virtual_port_create_request__l2gre.data
@@ -54,3 +54,24 @@
     of_bsn_virtual_port_create_request_vport_set(obj, vport);
     of_object_delete(vport);
 }
+-- java
+builder.setXid(0x01020304)
+    .setVport(
+        factory.buildBsnVportL2Gre()
+            .setFlags(
+                ImmutableSet.<OFBsnVportL2GreFlags>of(
+                    OFBsnVportL2GreFlags.BSN_VPORT_L2GRE_LOCAL_MAC_IS_VALID,
+                    OFBsnVportL2GreFlags.BSN_VPORT_L2GRE_DSCP_ASSIGN
+                )
+            )
+            .setPortNo(OFPort.of(1))
+            .setLocalMac(MacAddress.of("0a:0b:0c:0d:0e:0f"))
+            .setNhMac(MacAddress.of("01:02:03:04:05:06"))
+            .setSrcIp(IPv4Address.of("192.0.0.2"))
+            .setDstIp(IPv4Address.of("192.0.16.2"))
+            .setDscp((short)1)
+            .setTtl((short)64)
+            .setVpn(0xbeef)
+            .setIfName("foo")
+            .build()
+    );
diff --git a/test_data/of13/bsn_vport_create_request__q_in_q.data b/test_data/of13/bsn_virtual_port_create_request__q_in_q.data
similarity index 81%
rename from test_data/of13/bsn_vport_create_request__q_in_q.data
rename to test_data/of13/bsn_virtual_port_create_request__q_in_q.data
index 19c5876..ca53fbe 100644
--- a/test_data/of13/bsn_vport_create_request__q_in_q.data
+++ b/test_data/of13/bsn_virtual_port_create_request__q_in_q.data
@@ -39,3 +39,15 @@
     of_bsn_virtual_port_create_request_vport_set(obj, vport);
     of_object_delete(vport);
 }
+-- java
+builder.setXid(0x01020304)
+    .setVport(
+        factory.buildBsnVportQInQ()
+            .setPortNo(1)
+            .setIngressTpid(2)
+            .setIngressVlanId(3)
+            .setEgressTpid(4)
+            .setEgressVlanId(5)
+            .setIfName("foo")
+            .build()
+    );