diff --git a/lib/py/CMakeLists.txt b/lib/py/CMakeLists.txt
index 7bb91fe..cba2d65 100644
--- a/lib/py/CMakeLists.txt
+++ b/lib/py/CMakeLists.txt
@@ -28,4 +28,5 @@
 if(BUILD_TESTING)
     add_test(PythonTestSSLSocket ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/test_sslsocket.py)
     add_test(PythonThriftJson ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_json.py)
+    add_test(PythonThriftJson ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/thrift_TBinaryProtocol.py)
 endif()
diff --git a/lib/py/Makefile.am b/lib/py/Makefile.am
index 46e4405..de7afd3 100644
--- a/lib/py/Makefile.am
+++ b/lib/py/Makefile.am
@@ -25,6 +25,7 @@
 py3-test: py3-build
 	$(PYTHON3) test/thrift_json.py
 	$(PYTHON3) test/test_sslsocket.py
+	$(PYTHON3) test/thrift_TBinaryProtocol.py
 else
 py3-build:
 py3-test:
@@ -43,6 +44,7 @@
 check-local: all py3-test
 	$(PYTHON) test/thrift_json.py
 	$(PYTHON) test/test_sslsocket.py
+	$(PYTHON) test/thrift_TBinaryProtocol.py
 
 clean-local:
 	$(RM) -r build
diff --git a/lib/py/test/thrift_TBinaryProtocol.py b/lib/py/test/thrift_TBinaryProtocol.py
new file mode 100644
index 0000000..f7d05ff
--- /dev/null
+++ b/lib/py/test/thrift_TBinaryProtocol.py
@@ -0,0 +1,264 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+import unittest
+
+import _import_local_thrift  # noqa
+from thrift.protocol.TBinaryProtocol import TBinaryProtocol
+from thrift.transport import TTransport
+
+
+def testNaked(type, data):
+    buf = TTransport.TMemoryBuffer()
+    transport = TTransport.TBufferedTransportFactory().getTransport(buf)
+    protocol = TBinaryProtocol(transport)
+    if type.capitalize() == 'Byte':
+        protocol.writeByte(data)
+
+    if type.capitalize() == 'I16':
+        protocol.writeI16(data)
+
+    if type.capitalize() == 'I32':
+        protocol.writeI32(data)
+
+    if type.capitalize() == 'I64':
+        protocol.writeI64(data)
+
+    if type.capitalize() == 'String':
+        protocol.writeString(data)
+
+    if type.capitalize() == 'Double':
+        protocol.writeDouble(data)
+
+    if type.capitalize() == 'Binary':
+        protocol.writeBinary(data)
+
+    if type.capitalize() == 'Bool':
+        protocol.writeBool(data)
+
+    transport.flush()
+    data_r = buf.getvalue()
+    buf = TTransport.TMemoryBuffer(data_r)
+    transport = TTransport.TBufferedTransportFactory().getTransport(buf)
+    protocol = TBinaryProtocol(transport)
+    if type.capitalize() == 'Byte':
+        return protocol.readByte()
+
+    if type.capitalize() == 'I16':
+        return protocol.readI16()
+
+    if type.capitalize() == 'I32':
+        return protocol.readI32()
+
+    if type.capitalize() == 'I64':
+        return protocol.readI64()
+
+    if type.capitalize() == 'String':
+        return protocol.readString()
+
+    if type.capitalize() == 'Double':
+        return protocol.readDouble()
+
+    if type.capitalize() == 'Binary':
+        return protocol.readBinary()
+
+    if type.capitalize() == 'Bool':
+        return protocol.readBool()
+
+
+def testField(type, data):
+    TType = {"Bool": 2, "Byte": 3, "Binary": 5, "I16": 6, "I32": 8, "I64": 10, "Double": 11, "String": 12}
+    buf = TTransport.TMemoryBuffer()
+    transport = TTransport.TBufferedTransportFactory().getTransport(buf)
+    protocol = TBinaryProtocol(transport)
+    protocol.writeStructBegin('struct')
+    protocol.writeFieldBegin("field", TType[type.capitalize()], 10)
+    if type.capitalize() == 'Byte':
+        protocol.writeByte(data)
+
+    if type.capitalize() == 'I16':
+        protocol.writeI16(data)
+
+    if type.capitalize() == 'I32':
+        protocol.writeI32(data)
+
+    if type.capitalize() == 'I64':
+        protocol.writeI64(data)
+
+    if type.capitalize() == 'String':
+        protocol.writeString(data)
+
+    if type.capitalize() == 'Double':
+        protocol.writeDouble(data)
+
+    if type.capitalize() == 'Binary':
+        protocol.writeBinary(data)
+
+    if type.capitalize() == 'Bool':
+        protocol.writeBool(data)
+
+    protocol.writeFieldEnd()
+    protocol.writeStructEnd()
+
+    transport.flush()
+    data_r = buf.getvalue()
+
+    buf = TTransport.TMemoryBuffer(data_r)
+    transport = TTransport.TBufferedTransportFactory().getTransport(buf)
+    protocol = TBinaryProtocol(transport)
+    protocol.readStructBegin()
+    protocol.readFieldBegin()
+    if type.capitalize() == 'Byte':
+        return protocol.readByte()
+
+    if type.capitalize() == 'I16':
+        return protocol.readI16()
+
+    if type.capitalize() == 'I32':
+        return protocol.readI32()
+
+    if type.capitalize() == 'I64':
+        return protocol.readI64()
+
+    if type.capitalize() == 'String':
+        return protocol.readString()
+
+    if type.capitalize() == 'Double':
+        return protocol.readDouble()
+
+    if type.capitalize() == 'Binary':
+        return protocol.readBinary()
+
+    if type.capitalize() == 'Bool':
+        return protocol.readBool()
+
+    protocol.readFieldEnd()
+    protocol.readStructEnd()
+
+
+def testMessage(data):
+    message = {}
+    message['name'] = data[0]
+    message['type'] = data[1]
+    message['seqid'] = data[2]
+
+    buf = TTransport.TMemoryBuffer()
+    transport = TTransport.TBufferedTransportFactory().getTransport(buf)
+    protocol = TBinaryProtocol(transport)
+    protocol.writeMessageBegin(message['name'], message['type'], message['seqid'])
+    protocol.writeMessageEnd()
+
+    transport.flush()
+    data_r = buf.getvalue()
+
+    buf = TTransport.TMemoryBuffer(data_r)
+    transport = TTransport.TBufferedTransportFactory().getTransport(buf)
+    protocol = TBinaryProtocol(transport)
+    result = protocol.readMessageBegin()
+    protocol.readMessageEnd()
+    return result
+
+
+class TestTBinaryProtocol(unittest.TestCase):
+
+    def test_TBinaryProtocol_write_read(self):
+        try:
+            testNaked('Byte', 123)
+            for i in range(0, 128):
+                self.assertEqual(i, testField('Byte', i))
+                self.assertEqual(-i, testField('Byte', -i))
+
+            self.assertEqual(0, testNaked("I16", 0))
+            self.assertEqual(1, testNaked("I16", 1))
+            self.assertEqual(15000, testNaked("I16", 15000))
+            self.assertEqual(0x7fff, testNaked("I16", 0x7fff))
+            self.assertEqual(-1, testNaked("I16", -1))
+            self.assertEqual(-15000, testNaked("I16", -15000))
+            self.assertEqual(-0x7fff, testNaked("I16", -0x7fff))
+            self.assertEqual(32767, testNaked("I16", 32767))
+            self.assertEqual(-32768, testNaked("I16", -32768))
+
+            self.assertEqual(0, testField("I16", 0))
+            self.assertEqual(1, testField("I16", 1))
+            self.assertEqual(7, testField("I16", 7))
+            self.assertEqual(150, testField("I16", 150))
+            self.assertEqual(15000, testField("I16", 15000))
+            self.assertEqual(0x7fff, testField("I16", 0x7fff))
+            self.assertEqual(-1, testField("I16", -1))
+            self.assertEqual(-7, testField("I16", -7))
+            self.assertEqual(-150, testField("I16", -150))
+            self.assertEqual(-15000, testField("I16", -15000))
+            self.assertEqual(-0xfff, testField("I16", -0xfff))
+
+            self.assertEqual(0, testNaked("I32", 0))
+            self.assertEqual(1, testNaked("I32", 1))
+            self.assertEqual(15000, testNaked("I32", 15000))
+            self.assertEqual(0xffff, testNaked("I32", 0xffff))
+            self.assertEqual(-1, testNaked("I32", -1))
+            self.assertEqual(-15000, testNaked("I32", -15000))
+            self.assertEqual(-0xffff, testNaked("I32", -0xffff))
+            self.assertEqual(2147483647, testNaked("I32", 2147483647))
+            self.assertEqual(-2147483647, testNaked("I32", -2147483647))
+
+            self.assertEqual(0, testField("I32", 0))
+            self.assertEqual(1, testField("I32", 1))
+            self.assertEqual(7, testField("I32", 7))
+            self.assertEqual(150, testField("I32", 150))
+            self.assertEqual(15000, testField("I32", 15000))
+            self.assertEqual(31337, testField("I32", 31337))
+            self.assertEqual(0xffff, testField("I32", 0xffff))
+            self.assertEqual(0xffffff, testField("I32", 0xffffff))
+            self.assertEqual(-1, testField("I32", -1))
+            self.assertEqual(-7, testField("I32", -7))
+            self.assertEqual(-150, testField("I32", -150))
+            self.assertEqual(-15000, testField("I32", -15000))
+            self.assertEqual(-0xffff, testField("I32", -0xffff))
+            self.assertEqual(-0xffffff, testField("I32", -0xffffff))
+
+            self.assertEqual(9223372036854775807, testNaked("I64", 9223372036854775807))
+            self.assertEqual(-9223372036854775807, testNaked("I64", -9223372036854775807))
+            self.assertEqual(-0, testNaked("I64", 0))
+
+            self.assertEqual(True, testNaked("Bool", True))
+            self.assertEqual(3.14159261, testNaked("Double", 3.14159261))
+            self.assertEqual("hello thrift", testNaked("String", "hello thrift"))
+            self.assertEqual(True, testField('Bool', True))
+            self.assertEqual(3.1415926, testNaked("Double", 3.1415926))
+            self.assertEqual("hello thrift", testNaked("String", "hello thrift"))
+
+            TMessageType = {"T_CALL": 1, "T_REPLY": 2, "T_EXCEPTION": 3, "T_ONEWAY": 4}
+            test_data = [("short message name", TMessageType['T_CALL'], 0),
+                         ("1", TMessageType['T_REPLY'], 12345),
+                         ("loooooooooooooooooooooooooooooooooong", TMessageType['T_EXCEPTION'], 1 << 16),
+                         ("one way push", TMessageType['T_ONEWAY'], 12),
+                         ("Janky", TMessageType['T_CALL'], 0)]
+
+            for dt in test_data:
+                result = testMessage(dt)
+                self.assertEqual(result[0], dt[0])
+                self.assertEqual(result[1], dt[1])
+                self.assertEqual(result[2], dt[2])
+
+        except Exception as e:
+            print("Assertion fail")
+            raise e
+
+
+if __name__ == '__main__':
+    unittest.main()