diff --git a/ryu/tests/packet_data/bgp4/bgp4-keepalive b/ryu/tests/packet_data/bgp4/bgp4-keepalive
deleted file mode 100644
index 78ebde2e..00000000
Binary files a/ryu/tests/packet_data/bgp4/bgp4-keepalive and /dev/null differ
diff --git a/ryu/tests/packet_data/bgp4/bgp4-keepalive.pcap b/ryu/tests/packet_data/bgp4/bgp4-keepalive.pcap
new file mode 100644
index 00000000..355e9dab
Binary files /dev/null and b/ryu/tests/packet_data/bgp4/bgp4-keepalive.pcap differ
diff --git a/ryu/tests/packet_data/bgp4/bgp4-open b/ryu/tests/packet_data/bgp4/bgp4-open
deleted file mode 100644
index 701f2fbd..00000000
Binary files a/ryu/tests/packet_data/bgp4/bgp4-open and /dev/null differ
diff --git a/ryu/tests/packet_data/bgp4/bgp4-open.pcap b/ryu/tests/packet_data/bgp4/bgp4-open.pcap
new file mode 100644
index 00000000..1ef507bb
Binary files /dev/null and b/ryu/tests/packet_data/bgp4/bgp4-open.pcap differ
diff --git a/ryu/tests/packet_data/bgp4/bgp4-update b/ryu/tests/packet_data/bgp4/bgp4-update
deleted file mode 100644
index 8fbc238d..00000000
Binary files a/ryu/tests/packet_data/bgp4/bgp4-update and /dev/null differ
diff --git a/ryu/tests/packet_data/bgp4/bgp4-update.pcap b/ryu/tests/packet_data/bgp4/bgp4-update.pcap
new file mode 100644
index 00000000..37354938
Binary files /dev/null and b/ryu/tests/packet_data/bgp4/bgp4-update.pcap differ
diff --git a/ryu/tests/unit/packet/test_bgp.py b/ryu/tests/unit/packet/test_bgp.py
index 17bef871..b3c11984 100644
--- a/ryu/tests/unit/packet/test_bgp.py
+++ b/ryu/tests/unit/packet/test_bgp.py
@@ -22,6 +22,7 @@ import unittest
 from nose.tools import eq_
 from nose.tools import ok_
 
+from ryu.lib.packet import packet
 from ryu.lib.packet import bgp
 from ryu.lib.packet import afi
 from ryu.lib.packet import safi
@@ -208,11 +209,10 @@ class Test_bgp(unittest.TestCase):
 
         for f in files:
             print('testing %s' % f)
-            binmsg = open(BGP4_PACKET_DATA_DIR + f, 'rb').read()
-            msg, rest = bgp.BGPMessage.parser(binmsg)
-            binmsg2 = msg.serialize()
-            eq_(binmsg, binmsg2)
-            eq_(rest, b'')
+            msg_buf = open(BGP4_PACKET_DATA_DIR + f + '.pcap', 'rb').read()
+            pkt = packet.Packet(msg_buf)
+            pkt.serialize()
+            eq_(msg_buf, pkt.data)
 
     def test_json1(self):
         opt_param = [bgp.BGPOptParamCapabilityUnknown(cap_code=200,