diff --git a/trezorlib/tests/device_tests/test_cosi.py b/trezorlib/tests/device_tests/test_cosi.py
index bcfe02f822..2152f5997f 100644
--- a/trezorlib/tests/device_tests/test_cosi.py
+++ b/trezorlib/tests/device_tests/test_cosi.py
@@ -23,7 +23,7 @@ import hashlib
 from trezorlib import ed25519raw, ed25519cosi
 
 
-class TestDeviceCosi(common.TrezorTest):
+class TestCosi(common.TrezorTest):
 
     def test_cosi_commit(self):
         self.setup_mnemonic_pin_passphrase()
diff --git a/trezorlib/tests/device_tests/test_debuglink.py b/trezorlib/tests/device_tests/test_debuglink.py
index 1334a975dc..f86cbe3405 100644
--- a/trezorlib/tests/device_tests/test_debuglink.py
+++ b/trezorlib/tests/device_tests/test_debuglink.py
@@ -22,7 +22,7 @@ from . import common
 from trezorlib import messages as proto
 
 
-class TestDebugLink(common.TrezorTest):
+class TestDebuglink(common.TrezorTest):
 
     def test_layout(self):
         layout = self.client.debug.read_layout()
diff --git a/trezorlib/tests/device_tests/test_msg_getaddress_show.py b/trezorlib/tests/device_tests/test_msg_getaddress_show.py
index 840ddd4355..773e52acf8 100644
--- a/trezorlib/tests/device_tests/test_msg_getaddress_show.py
+++ b/trezorlib/tests/device_tests/test_msg_getaddress_show.py
@@ -22,7 +22,7 @@ import trezorlib.ckd_public as bip32
 from trezorlib import messages as proto
 
 
-class TestMsgGetaddress(common.TrezorTest):
+class TestMsgGetaddressShow(common.TrezorTest):
 
     def test_show(self):
         self.setup_mnemonic_nopin_nopassphrase()
diff --git a/trezorlib/tests/device_tests/test_msg_getpublickey.py b/trezorlib/tests/device_tests/test_msg_getpublickey.py
index 88c3b9f8d6..2714a18038 100644
--- a/trezorlib/tests/device_tests/test_msg_getpublickey.py
+++ b/trezorlib/tests/device_tests/test_msg_getpublickey.py
@@ -21,7 +21,7 @@ from . import common
 import trezorlib.ckd_public as bip32
 
 
-class TestMsgGetpublic_key(common.TrezorTest):
+class TestMsgGetpublickey(common.TrezorTest):
 
     def test_btc(self):
         self.setup_mnemonic_nopin_nopassphrase()
diff --git a/trezorlib/tests/device_tests/test_msg_ping.py b/trezorlib/tests/device_tests/test_msg_ping.py
index a86c7d3e1a..7b0e423511 100644
--- a/trezorlib/tests/device_tests/test_msg_ping.py
+++ b/trezorlib/tests/device_tests/test_msg_ping.py
@@ -22,7 +22,7 @@ from . import common
 from trezorlib import messages as proto
 
 
-class TestPing(common.TrezorTest):
+class TestMsgPing(common.TrezorTest):
 
     def test_ping(self):
         self.setup_mnemonic_pin_passphrase()
diff --git a/trezorlib/tests/device_tests/test_msg_recoverydevice.py b/trezorlib/tests/device_tests/test_msg_recoverydevice.py
index df6de698c6..d713df49e0 100644
--- a/trezorlib/tests/device_tests/test_msg_recoverydevice.py
+++ b/trezorlib/tests/device_tests/test_msg_recoverydevice.py
@@ -24,7 +24,7 @@ from . import common
 from trezorlib import messages as proto
 
 
-class TestDeviceRecovery(common.TrezorTest):
+class TestMsgRecoverydevice(common.TrezorTest):
 
     def test_pin_passphrase(self):
         mnemonic = self.mnemonic12.split(' ')
diff --git a/trezorlib/tests/device_tests/test_msg_recoverydevice_dryrun.py b/trezorlib/tests/device_tests/test_msg_recoverydevice_dryrun.py
index b0ad1a9b6c..f0c7ad1cb4 100644
--- a/trezorlib/tests/device_tests/test_msg_recoverydevice_dryrun.py
+++ b/trezorlib/tests/device_tests/test_msg_recoverydevice_dryrun.py
@@ -24,7 +24,7 @@ from . import common
 from trezorlib import messages as proto
 
 
-class TestDeviceRecoveryDryRun(common.TrezorTest):
+class TestMsgRecoverydeviceDryrun(common.TrezorTest):
 
     def recovery_loop(self, mnemonic, result):
         ret = self.client.call_raw(proto.RecoveryDevice(word_count=12,
diff --git a/trezorlib/tests/device_tests/test_msg_resetdevice.py b/trezorlib/tests/device_tests/test_msg_resetdevice.py
index 24384f2bc1..58e03a8d94 100644
--- a/trezorlib/tests/device_tests/test_msg_resetdevice.py
+++ b/trezorlib/tests/device_tests/test_msg_resetdevice.py
@@ -23,7 +23,7 @@ from trezorlib import messages as proto
 from mnemonic import Mnemonic
 
 
-class TestDeviceReset(common.TrezorTest):
+class TestMsgResetDevice(common.TrezorTest):
 
     def test_reset_device(self):
 
diff --git a/trezorlib/tests/device_tests/test_msg_resetdevice_skipbackup.py b/trezorlib/tests/device_tests/test_msg_resetdevice_skipbackup.py
index 0681075ea4..380e91c8d4 100644
--- a/trezorlib/tests/device_tests/test_msg_resetdevice_skipbackup.py
+++ b/trezorlib/tests/device_tests/test_msg_resetdevice_skipbackup.py
@@ -23,7 +23,7 @@ from trezorlib import messages as proto
 from mnemonic import Mnemonic
 
 
-class TestDeviceResetSkipBackup(common.TrezorTest):
+class TestMsgResetDeviceSkipbackup(common.TrezorTest):
 
     def test_reset_device_skip_backup(self):
 
diff --git a/trezorlib/tests/device_tests/test_msg_signmessage_segwit.py b/trezorlib/tests/device_tests/test_msg_signmessage_segwit.py
index c2c76d215c..4f4db596f9 100644
--- a/trezorlib/tests/device_tests/test_msg_signmessage_segwit.py
+++ b/trezorlib/tests/device_tests/test_msg_signmessage_segwit.py
@@ -23,7 +23,7 @@ import binascii
 from trezorlib import messages as proto
 
 
-class TestMsgSignmessage(common.TrezorTest):
+class TestMsgSignmessageSegwit(common.TrezorTest):
 
     def test_sign(self):
         self.setup_mnemonic_nopin_nopassphrase()
diff --git a/trezorlib/tests/device_tests/test_msg_signmessage_segwit_native.py b/trezorlib/tests/device_tests/test_msg_signmessage_segwit_native.py
index ef915a84fa..53ad4f42c9 100644
--- a/trezorlib/tests/device_tests/test_msg_signmessage_segwit_native.py
+++ b/trezorlib/tests/device_tests/test_msg_signmessage_segwit_native.py
@@ -23,7 +23,7 @@ import binascii
 from trezorlib import messages as proto
 
 
-class TestMsgSignmessage(common.TrezorTest):
+class TestMsgSignmessageSegwitNative(common.TrezorTest):
 
     def test_sign(self):
         self.setup_mnemonic_nopin_nopassphrase()
diff --git a/trezorlib/tests/device_tests/test_msg_signtx_bch.py b/trezorlib/tests/device_tests/test_msg_signtx_bch.py
index 993f27163d..1d78f51967 100644
--- a/trezorlib/tests/device_tests/test_msg_signtx_bch.py
+++ b/trezorlib/tests/device_tests/test_msg_signtx_bch.py
@@ -27,7 +27,7 @@ from trezorlib.client import CallException
 TxApiBitcoinCash = TxApiInsight(network='insight_bch', url='https://bch-bitcore2.trezor.io/api/')
 
 
-class TestMsgSigntxSegwit(common.TrezorTest):
+class TestMsgSigntxBch(common.TrezorTest):
 
     def test_send_bch_change(self):
         self.setup_mnemonic_allallall()
diff --git a/trezorlib/tests/device_tests/test_msg_signtx_segwit_native.py b/trezorlib/tests/device_tests/test_msg_signtx_segwit_native.py
index a4c4655081..2bc8748841 100644
--- a/trezorlib/tests/device_tests/test_msg_signtx_segwit_native.py
+++ b/trezorlib/tests/device_tests/test_msg_signtx_segwit_native.py
@@ -24,7 +24,7 @@ from trezorlib.tx_api import TxApiTestnet
 from trezorlib.ckd_public import deserialize
 
 
-class TestMsgSigntxSegwit(common.TrezorTest):
+class TestMsgSigntxSegwitNative(common.TrezorTest):
 
     def test_send_p2sh(self):
         self.setup_mnemonic_allallall()
diff --git a/trezorlib/tests/device_tests/test_msg_signtx_zcash.py b/trezorlib/tests/device_tests/test_msg_signtx_zcash.py
index a05743e6f4..f5fb4d1f60 100644
--- a/trezorlib/tests/device_tests/test_msg_signtx_zcash.py
+++ b/trezorlib/tests/device_tests/test_msg_signtx_zcash.py
@@ -28,7 +28,7 @@ from trezorlib.tx_api import TxApiZcash
 TXHASH_93373e = binascii.unhexlify('93373e63cc626c4a7d049ad775d6511bb5eba985f142db660c9b9f955c722f5c')
 
 
-class TestMsgSigntx(common.TrezorTest):
+class TestMsgSigntxZcash(common.TrezorTest):
 
     def test_one_one_fee(self):
         self.setup_mnemonic_allallall()
diff --git a/trezorlib/tests/device_tests/test_msg_verifymessage_segwit_native.py b/trezorlib/tests/device_tests/test_msg_verifymessage_segwit_native.py
index 4783dd8198..d0ed88f329 100644
--- a/trezorlib/tests/device_tests/test_msg_verifymessage_segwit_native.py
+++ b/trezorlib/tests/device_tests/test_msg_verifymessage_segwit_native.py
@@ -22,7 +22,7 @@ import binascii
 import base64
 
 
-class TestMsgVerifymessageSegwit(common.TrezorTest):
+class TestMsgVerifymessageSegwitNative(common.TrezorTest):
 
     def test_message_long(self):
         self.setup_mnemonic_nopin_nopassphrase()
diff --git a/trezorlib/tests/device_tests/test_msg_wipedevice.py b/trezorlib/tests/device_tests/test_msg_wipedevice.py
index e0a83bd640..17dc602824 100644
--- a/trezorlib/tests/device_tests/test_msg_wipedevice.py
+++ b/trezorlib/tests/device_tests/test_msg_wipedevice.py
@@ -22,7 +22,7 @@ from . import common
 from trezorlib import messages as proto
 
 
-class TestDeviceWipe(common.TrezorTest):
+class TestMsgWipedevice(common.TrezorTest):
 
     def test_wipe_device(self):
         self.setup_mnemonic_pin_passphrase()
diff --git a/trezorlib/tests/device_tests/test_zerosig.py b/trezorlib/tests/device_tests/test_zerosig.py
index b572253e04..cff99050ad 100644
--- a/trezorlib/tests/device_tests/test_zerosig.py
+++ b/trezorlib/tests/device_tests/test_zerosig.py
@@ -31,7 +31,7 @@ TXHASH_d5f65e = binascii.unhexlify('d5f65ee80147b4bcc70b75e4bbf2d7382021b871bd88
 
 # address_n = [177] < 68
 # address_n = [16518] < 66
-class TestZeroSig(common.TrezorTest):
+class TestZerosig(common.TrezorTest):
 
     '''
     def test_mine_zero_signature(self):
diff --git a/trezorlib/tests/unit_tests/test_ckd_public.py b/trezorlib/tests/unit_tests/test_ckd_public.py
index defddd7ba8..d7f36fb3d0 100644
--- a/trezorlib/tests/unit_tests/test_ckd_public.py
+++ b/trezorlib/tests/unit_tests/test_ckd_public.py
@@ -19,7 +19,7 @@
 from trezorlib import ckd_public
 
 
-def test_ckd():
+def test_ckd_public():
     xpub1 = 'xpub661MyMwAqRbcEnKbXcCqD2GT1di5zQxVqoHPAgHNe8dv5JP8gWmDproS6kFHJnLZd23tWevhdn4urGJ6b264DfTGKr8zjmYDjyDTi9U7iyT'
     node1 = ckd_public.deserialize(xpub1)
     node2 = ckd_public.public_ckd(node1, [0])
diff --git a/trezorlib/tests/unit_tests/test_tx_api.py b/trezorlib/tests/unit_tests/test_tx_api.py
index 4002349973..888874dd0d 100644
--- a/trezorlib/tests/unit_tests/test_tx_api.py
+++ b/trezorlib/tests/unit_tests/test_tx_api.py
@@ -24,7 +24,7 @@ from trezorlib.tx_api import TxApiBitcoin, TxApiTestnet
 tests_dir = os.path.dirname(os.path.abspath(__file__))
 
 
-def test_txapi_gettx():
+def test_tx_api_gettx():
     tx_api.cache_dir = os.path.join(tests_dir, '../txcache')
 
     TxApiBitcoin.get_tx('39a29e954977662ab3879c66fb251ef753e0912223a83d1dcb009111d28265e5')