diff --git a/tests/test_messages.py b/tests/test_messages.py
index e68ba9bf84..db5918f931 100644
--- a/tests/test_messages.py
+++ b/tests/test_messages.py
@@ -10,7 +10,7 @@ class TestMessages(common.TrezorTest):
     def test_message_sign(self):
         sig = self.client.sign_message([0], "This is an example of a signed message.")
         self.assertEqual(sig.address, '14LmW5k4ssUrtbAB4255zdqv3b4w1TuX9e')
-        self.assertEqual(binascii.hexlify(sig.signature), XXX)
+        self.assertEqual(binascii.hexlify(sig.signature), '209e23edf0e4e47ff1dec27f32cd78c50e74ef018ee8a6adf35ae17c7a9b0dd96f48b493fd7dbab03efb6f439c6383c9523b3bbc5f1a7d158a6af90ab154e9be80')
 
     def test_message_verify(self):
 
@@ -20,7 +20,7 @@ class TestMessages(common.TrezorTest):
             binascii.unhexlify('1ba77e01a9e17ba158b962cfef5f13dfed676ffc2b4bada24e58f784458b52b97421470d001d53d5880cf5e10e76f02be3e80bf21e18398cbd41e8c3b4af74c8c2'),
             'This is an example of a signed message.'
         )
-        self.assertIsInstance(res, proto.Success)
+        self.assertTrue(res)
 
         # uncompressed pubkey - FAIL
         res = self.client.verify_message(
@@ -28,15 +28,14 @@ class TestMessages(common.TrezorTest):
             binascii.unhexlify('1ba77e01a9e17ba158b96200000000dfed676ffc2b4bada24e58f784458b52b97421470d001d53d5880cf5e10e76f02be3e80bf21e18398cbd41e8c3b4af74c8c2'),
             'This is an example of a signed message.'
         )
-        self.assertIsInstance(res, proto.Failure)
-        self.assertEqual(res.code, proto_types.Failure_InvalidSignature)
+        self.assertFalse(res)
 
         # compressed pubkey - OK
         res = self.client.verify_message(
             '1C7zdTfnkzmr13HfA2vNm5SJYRK6nEKyq8',
             binascii.unhexlify('1f44e3e461f7ca9f57c472ce1a28214df1de1dadefb6551a32d1907b80c74d5a1fbfd6daaba12dd8cb06699ce3f6941fbe0f3957b5802d13076181046e741eaaaf'),
             'This is an example of a signed message.')
-        self.assertIsInstance(res, proto.Success)
+        self.assertTrue(res)
 
         # compressed pubkey - FAIL
         res = self.client.verify_message(
@@ -44,22 +43,24 @@ class TestMessages(common.TrezorTest):
             binascii.unhexlify('1f44e3e461f7ca9f57c472000000004df1de1dadefb6551a32d1907b80c74d5a1fbfd6daaba12dd8cb06699ce3f6941fbe0f3957b5802d13076181046e741eaaaf'),
             'This is an example of a signed message.'
         )
-        self.assertIsInstance(res, proto.Failure)
-        self.assertEqual(res.code, proto_types.Failure_InvalidSignature)
+        self.assertFalse(res)
 
         # trezor pubkey - OK
         res = self.client.verify_message(
             '14LmW5k4ssUrtbAB4255zdqv3b4w1TuX9e',
-            binascii.unhexlify(XXX),
+            binascii.unhexlify('209e23edf0e4e47ff1dec27f32cd78c50e74ef018ee8a6adf35ae17c7a9b0dd96f48b493fd7dbab03efb6f439c6383c9523b3bbc5f1a7d158a6af90ab154e9be80'),
             'This is an example of a signed message.'
         )
-        self.assertIsInstance(res, proto.Success)
+        self.assertTrue(res)
 
         # trezor pubkey - FAIL
         res = self.client.verify_message(
             '14LmW5k4ssUrtbAB4255zdqv3b4w1TuX9e',
-            binascii.unhexlify(XXX__),
+            binascii.unhexlify('209e23edf0e4e47ff1de000002cd78c50e74ef018ee8a6adf35ae17c7a9b0dd96f48b493fd7dbab03efb6f439c6383c9523b3bbc5f1a7d158a6af90ab154e9be80'),
             'This is an example of a signed message.'
         )
-        self.assertIsInstance(res, proto.Failure)
-        self.assertEqual(res.code, proto_types.Failure_InvalidSignature)
+        self.assertFalse(res)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/trezorlib/client.py b/trezorlib/client.py
index 97dfcebe78..f176a67c0f 100755
--- a/trezorlib/client.py
+++ b/trezorlib/client.py
@@ -3,7 +3,6 @@ import time
 import binascii
 import hashlib
 
-import ckd_public
 import tools
 import messages_pb2 as proto
 import types_pb2 as types