diff --git a/src/Test/TestMsgpack.py b/src/Test/TestMsgpack.py
index c8ca20cf..e84862f9 100644
--- a/src/Test/TestMsgpack.py
+++ b/src/Test/TestMsgpack.py
@@ -1,24 +1,25 @@
-import cStringIO as StringIO
+import io
+import os
 
 import msgpack
 import pytest
 
 from Config import config
-from util import StreamingMsgpack
+from util import Msgpack
 
 
 class TestMsgpack:
     test_data = {"cmd": "fileGet", "params": {"site": "1Site"}, "utf8": b'\xc3\xa1rv\xc3\xadzt\xc5\xb1r\xc5\x91'.decode("utf8"), "bin": b'p\x81zDhL\xf0O\xd0\xaf', "list": [b'p\x81zDhL\xf0O\xd0\xaf', b'p\x81zDhL\xf0O\xd0\xaf']}
 
     def testUnpackinkg(self):
-        assert msgpack.unpackb(msgpack.packb(self.test_data)) == self.test_data
+        assert Msgpack.unpack(Msgpack.pack(self.test_data)) == self.test_data
 
     @pytest.mark.parametrize("unpacker_class", [msgpack.Unpacker, msgpack.fallback.Unpacker])
     def testUnpacker(self, unpacker_class):
-        unpacker = unpacker_class()
+        unpacker = unpacker_class(raw=False)
 
-        data = msgpack.packb(self.test_data)
-        data += msgpack.packb(self.test_data)
+        data = msgpack.packb(self.test_data, use_bin_type=True)
+        data += msgpack.packb(self.test_data, use_bin_type=True)
 
         messages = []
         for char in data:
@@ -36,8 +37,8 @@ class TestMsgpack:
 
         data = {"cmd": "response", "params": f}
 
-        out_buff = StringIO.StringIO()
-        StreamingMsgpack.stream(data, out_buff.write)
+        out_buff = io.BytesIO()
+        Msgpack.stream(data, out_buff.write)
         out_buff.seek(0)
 
         data_packb = {"cmd": "response", "params": open("%s/users.json" % config.data_dir).read(10)}