diff --git a/test_data/of10/packet_in.data b/test_data/of10/packet_in.data
index bd89cf8..a8de82c 100644
--- a/test_data/of10/packet_in.data
+++ b/test_data/of10/packet_in.data
@@ -30,7 +30,7 @@
 -- java
 builder
    .setXid(0x12345678)
-   .setBufferId(0xabcdef01L)
+   .setBufferId(OFBufferId.of(0xabcdef01))
    .setTotalLen(9)
    .setInPort(OFPort.LOCAL)
    .setReason(OFPacketInReason.ACTION)
diff --git a/test_data/of13/flow_add.data b/test_data/of13/flow_add.data
index 049d797..80f61e5 100644
--- a/test_data/of13/flow_add.data
+++ b/test_data/of13/flow_add.data
@@ -80,7 +80,7 @@
     .setIdleTimeout(5)
     .setHardTimeout(10)
     .setPriority(6000)
-    .setBufferId(50)
+    .setBufferId(OFBufferId.of(50))
     .setOutPort(OFPort.of(6))
     .setOutGroup(8)
     .setFlags(ImmutableSet.<OFFlowModFlags>of())
diff --git a/test_data/of13/flow_delete.data b/test_data/of13/flow_delete.data
index 268304c..afbc83a 100644
--- a/test_data/of13/flow_delete.data
+++ b/test_data/of13/flow_delete.data
@@ -80,7 +80,7 @@
     .setIdleTimeout(5)
     .setHardTimeout(10)
     .setPriority(6000)
-    .setBufferId(50)
+    .setBufferId(OFBufferId.of(50))
     .setOutPort(OFPort.of(6))
     .setOutGroup(8)
     .setFlags(ImmutableSet.<OFFlowModFlags>of())
diff --git a/test_data/of13/flow_delete_strict.data b/test_data/of13/flow_delete_strict.data
index 6165405..845b2da 100644
--- a/test_data/of13/flow_delete_strict.data
+++ b/test_data/of13/flow_delete_strict.data
@@ -80,7 +80,7 @@
     .setIdleTimeout(5)
     .setHardTimeout(10)
     .setPriority(6000)
-    .setBufferId(50)
+    .setBufferId(OFBufferId.of(50))
     .setOutPort(OFPort.of(6))
     .setOutGroup(8)
     .setFlags(ImmutableSet.<OFFlowModFlags>of())
diff --git a/test_data/of13/flow_modify.data b/test_data/of13/flow_modify.data
index 188ab3d..d382610 100644
--- a/test_data/of13/flow_modify.data
+++ b/test_data/of13/flow_modify.data
@@ -80,7 +80,7 @@
     .setIdleTimeout(5)
     .setHardTimeout(10)
     .setPriority(6000)
-    .setBufferId(50)
+    .setBufferId(OFBufferId.of(50))
     .setOutPort(OFPort.of(6))
     .setOutGroup(8)
     .setFlags(ImmutableSet.<OFFlowModFlags>of())
diff --git a/test_data/of13/flow_modify_strict.data b/test_data/of13/flow_modify_strict.data
index a40210a..6b88972 100644
--- a/test_data/of13/flow_modify_strict.data
+++ b/test_data/of13/flow_modify_strict.data
@@ -80,7 +80,7 @@
     .setIdleTimeout(5)
     .setHardTimeout(10)
     .setPriority(6000)
-    .setBufferId(50)
+    .setBufferId(OFBufferId.of(50))
     .setOutPort(OFPort.of(6))
     .setOutGroup(8)
     .setFlags(ImmutableSet.<OFFlowModFlags>of())
diff --git a/test_data/of13/packet_in.data b/test_data/of13/packet_in.data
index 1ec0422..b32bbee 100644
--- a/test_data/of13/packet_in.data
+++ b/test_data/of13/packet_in.data
@@ -33,7 +33,7 @@
 -- java
 builder
    .setXid(0x12345678)
-   .setBufferId(100)
+   .setBufferId(OFBufferId.of(100))
    .setTotalLen(17000)
    .setReason(OFPacketInReason.ACTION)
    .setTableId((byte) 20)