diff --git a/tests/test_msg_changepin.py b/tests/test_msg_changepin.py
new file mode 100644
index 0000000000..1594d95497
--- /dev/null
+++ b/tests/test_msg_changepin.py
@@ -0,0 +1,131 @@
+import time
+import unittest
+import common
+
+from trezorlib import messages_pb2 as proto
+from trezorlib import types_pb2 as proto_types
+
+class TestMsgChangepin(common.TrezorTest):
+    def test_set_pin(self):
+        self.setup_mnemonic_nopin_nopassphrase()
+        features = self.client.call_raw(proto.Initialize())
+        self.assertFalse(features.pin_protection)
+
+        # Check that there's no PIN protection
+        ret = self.client.call_raw(proto.Ping(pin_protection=True))
+        self.assertIsInstance(ret, proto.Success)
+
+        # Let's set new PIN
+        ret = self.client.call_raw(proto.ChangePin())
+        self.assertIsInstance(ret, proto.ButtonRequest)
+
+        # Press button
+        self.client.debug.press_yes()
+        ret = self.client.call_raw(proto.ButtonAck())
+
+        # Send the PIN for first time
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+        pin_encoded = self.client.debug.encode_pin(self.pin6)
+        ret = self.client.call_raw(proto.PinMatrixAck(pin=pin_encoded))
+
+        # Send the PIN for second time
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+        pin_encoded = self.client.debug.encode_pin(self.pin6)
+        ret = self.client.call_raw(proto.PinMatrixAck(pin=pin_encoded))
+
+        # Now we're done
+        self.assertIsInstance(ret, proto.Success)
+
+        # Check that there's PIN protection now
+        features = self.client.call_raw(proto.Initialize())
+        self.assertTrue(features.pin_protection)
+        ret = self.client.call_raw(proto.Ping(pin_protection=True))
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+
+        # Check that the PIN is correct
+        self.assertEqual(self.client.debug.read_pin()[0], self.pin6)
+
+    def test_change_pin(self):
+        self.setup_mnemonic_pin_passphrase()
+        features = self.client.call_raw(proto.Initialize())
+        self.assertTrue(features.pin_protection)
+
+        # Check that there's PIN protection
+        ret = self.client.call_raw(proto.Ping(pin_protection=True))
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+        self.client.call_raw(proto.Cancel())
+
+        # Check current PIN value
+        self.assertEqual(self.client.debug.read_pin()[0], self.pin4)
+
+        # Let's change PIN
+        ret = self.client.call_raw(proto.ChangePin())
+        self.assertIsInstance(ret, proto.ButtonRequest)
+
+        # Press button
+        self.client.debug.press_yes()
+        ret = self.client.call_raw(proto.ButtonAck())
+
+        # Send current PIN
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+        pin_encoded = self.client.debug.read_pin_encoded()
+        ret = self.client.call_raw(proto.PinMatrixAck(pin=pin_encoded))
+
+        # Send new PIN for first time
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+        pin_encoded = self.client.debug.encode_pin(self.pin6)
+        ret = self.client.call_raw(proto.PinMatrixAck(pin=pin_encoded))
+
+        # Send the PIN for second time
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+        pin_encoded = self.client.debug.encode_pin(self.pin6)
+        ret = self.client.call_raw(proto.PinMatrixAck(pin=pin_encoded))
+
+        # Now we're done
+        self.assertIsInstance(ret, proto.Success)
+
+        # Check that there's still PIN protection now
+        features = self.client.call_raw(proto.Initialize())
+        self.assertTrue(features.pin_protection)
+        ret = self.client.call_raw(proto.Ping(pin_protection=True))
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+        self.client.call_raw(proto.Cancel())
+
+        # Check that the PIN is correct
+        self.assertEqual(self.client.debug.read_pin()[0], self.pin6)
+
+
+    def test_remove_pin(self):
+        self.setup_mnemonic_pin_passphrase()
+        features = self.client.call_raw(proto.Initialize())
+        self.assertTrue(features.pin_protection)
+
+        # Check that there's PIN protection
+        ret = self.client.call_raw(proto.Ping(pin_protection=True))
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+        self.client.call_raw(proto.Cancel())
+
+        # Let's remove PIN
+        ret = self.client.call_raw(proto.ChangePin(remove=True))
+        self.assertIsInstance(ret, proto.ButtonRequest)
+
+        # Press button
+        self.client.debug.press_yes()
+        ret = self.client.call_raw(proto.ButtonAck())
+
+        # Send current PIN
+        self.assertIsInstance(ret, proto.PinMatrixRequest)
+        pin_encoded = self.client.debug.read_pin_encoded()
+        ret = self.client.call_raw(proto.PinMatrixAck(pin=pin_encoded))
+
+        # Now we're done
+        self.assertIsInstance(ret, proto.Success)
+
+        # Check that there's no PIN protection now
+        features = self.client.call_raw(proto.Initialize())
+        self.assertFalse(features.pin_protection)
+        ret = self.client.call_raw(proto.Ping(pin_protection=True))
+        self.assertIsInstance(ret, proto.Success)
+        
+if __name__ == '__main__':
+    unittest.main()