diff --git a/trezorlib/tests/device_tests/test_basic.py b/trezorlib/tests/device_tests/test_basic.py
index 64c1405dc8..14812c3839 100644
--- a/trezorlib/tests/device_tests/test_basic.py
+++ b/trezorlib/tests/device_tests/test_basic.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 
 from trezorlib import messages
diff --git a/trezorlib/tests/device_tests/test_bip32_speed.py b/trezorlib/tests/device_tests/test_bip32_speed.py
index 6d5c2dcdde..7d33892745 100644
--- a/trezorlib/tests/device_tests/test_bip32_speed.py
+++ b/trezorlib/tests/device_tests/test_bip32_speed.py
@@ -18,7 +18,6 @@
 
 from __future__ import print_function
 
-import unittest
 from . import common
 import time
 
diff --git a/trezorlib/tests/device_tests/test_cosi.py b/trezorlib/tests/device_tests/test_cosi.py
index 2152f5997f..6575fb02da 100644
--- a/trezorlib/tests/device_tests/test_cosi.py
+++ b/trezorlib/tests/device_tests/test_cosi.py
@@ -16,13 +16,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 import hashlib
 
 from trezorlib import ed25519raw, ed25519cosi
 
 
+@pytest.mark.skip_t2
 class TestCosi(common.TrezorTest):
 
     def test_cosi_commit(self):
diff --git a/trezorlib/tests/device_tests/test_debuglink.py b/trezorlib/tests/device_tests/test_debuglink.py
index f86cbe3405..70ff232f3f 100644
--- a/trezorlib/tests/device_tests/test_debuglink.py
+++ b/trezorlib/tests/device_tests/test_debuglink.py
@@ -16,12 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestDebuglink(common.TrezorTest):
 
     def test_layout(self):
diff --git a/trezorlib/tests/device_tests/test_msg_applysettings.py b/trezorlib/tests/device_tests/test_msg_applysettings.py
index f478e18386..e471d33964 100644
--- a/trezorlib/tests/device_tests/test_msg_applysettings.py
+++ b/trezorlib/tests/device_tests/test_msg_applysettings.py
@@ -16,12 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestMsgApplysettings(common.TrezorTest):
 
     def test_apply_settings(self):
diff --git a/trezorlib/tests/device_tests/test_msg_changepin.py b/trezorlib/tests/device_tests/test_msg_changepin.py
index 59820158cd..2373c8ff8e 100644
--- a/trezorlib/tests/device_tests/test_msg_changepin.py
+++ b/trezorlib/tests/device_tests/test_msg_changepin.py
@@ -16,12 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestMsgChangepin(common.TrezorTest):
 
     def test_set_pin(self):
diff --git a/trezorlib/tests/device_tests/test_msg_cipherkeyvalue.py b/trezorlib/tests/device_tests/test_msg_cipherkeyvalue.py
index caaa1a9d10..32a0959396 100644
--- a/trezorlib/tests/device_tests/test_msg_cipherkeyvalue.py
+++ b/trezorlib/tests/device_tests/test_msg_cipherkeyvalue.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
 
diff --git a/trezorlib/tests/device_tests/test_msg_clearsession.py b/trezorlib/tests/device_tests/test_msg_clearsession.py
index 23b5b95a28..343f01760e 100644
--- a/trezorlib/tests/device_tests/test_msg_clearsession.py
+++ b/trezorlib/tests/device_tests/test_msg_clearsession.py
@@ -16,12 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestMsgClearsession(common.TrezorTest):
 
     def test_clearsession(self):
diff --git a/trezorlib/tests/device_tests/test_msg_ethereum_getaddress.py b/trezorlib/tests/device_tests/test_msg_ethereum_getaddress.py
index 0bb79680e9..7e52b00478 100644
--- a/trezorlib/tests/device_tests/test_msg_ethereum_getaddress.py
+++ b/trezorlib/tests/device_tests/test_msg_ethereum_getaddress.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
 
diff --git a/trezorlib/tests/device_tests/test_msg_ethereum_signmessage.py b/trezorlib/tests/device_tests/test_msg_ethereum_signmessage.py
index 18e21e8afc..87026277de 100644
--- a/trezorlib/tests/device_tests/test_msg_ethereum_signmessage.py
+++ b/trezorlib/tests/device_tests/test_msg_ethereum_signmessage.py
@@ -15,11 +15,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 import binascii
 
 
+@pytest.mark.skip_t2
 class TestMsgEthereumSignmessage(common.TrezorTest):
 
     def test_sign(self):
diff --git a/trezorlib/tests/device_tests/test_msg_ethereum_signtx.py b/trezorlib/tests/device_tests/test_msg_ethereum_signtx.py
index 52efc79b50..271cd00a85 100644
--- a/trezorlib/tests/device_tests/test_msg_ethereum_signtx.py
+++ b/trezorlib/tests/device_tests/test_msg_ethereum_signtx.py
@@ -16,11 +16,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 import binascii
 
 
+@pytest.mark.skip_t2
 class TestMsgEthereumSigntx(common.TrezorTest):
 
     def test_ethereum_signtx_nodata(self):
diff --git a/trezorlib/tests/device_tests/test_msg_ethereum_verifymessage.py b/trezorlib/tests/device_tests/test_msg_ethereum_verifymessage.py
index bad5c69c6c..c1bbf0ae45 100644
--- a/trezorlib/tests/device_tests/test_msg_ethereum_verifymessage.py
+++ b/trezorlib/tests/device_tests/test_msg_ethereum_verifymessage.py
@@ -15,11 +15,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 import binascii
 
 
+@pytest.mark.skip_t2
 class TestMsgEthereumVerifymessage(common.TrezorTest):
 
     def test_verify(self):
diff --git a/trezorlib/tests/device_tests/test_msg_getaddress.py b/trezorlib/tests/device_tests/test_msg_getaddress.py
index 9db4f52a57..7ea492b6e1 100644
--- a/trezorlib/tests/device_tests/test_msg_getaddress.py
+++ b/trezorlib/tests/device_tests/test_msg_getaddress.py
@@ -17,7 +17,6 @@
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 import pytest
-import unittest
 from . import common
 from trezorlib import messages as proto
 import trezorlib.ckd_public as bip32
@@ -51,7 +50,7 @@ class TestMsgGetaddress(common.TrezorTest):
         self.assertEqual(self.client.get_address('Bcash', self.client.expand_path("44'/145'/0'/0/1")), '1LRspCZNFJcbuNKQkXgHMDucctFRQya5a3')
         self.assertEqual(self.client.get_address('Bcash', self.client.expand_path("44'/145'/0'/1/0")), '1HADRPJpgqBzThepERpVXNi6qRgiLQRNoE')
 
-    @pytest.mark.multisig
+    @pytest.mark.skip_t2
     def test_bch_multisig(self):
         self.setup_mnemonic_allallall()
         xpubs = []
diff --git a/trezorlib/tests/device_tests/test_msg_getaddress_segwit.py b/trezorlib/tests/device_tests/test_msg_getaddress_segwit.py
index da30f6d867..2f89fb7822 100644
--- a/trezorlib/tests/device_tests/test_msg_getaddress_segwit.py
+++ b/trezorlib/tests/device_tests/test_msg_getaddress_segwit.py
@@ -1,4 +1,20 @@
-import unittest
+# This file is part of the TREZOR project.
+#
+# Copyright (C) 2016-2017 Pavol Rusnak <stick@satoshilabs.com>
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
 from . import common
 import trezorlib.ckd_public as bip32
 from trezorlib import messages as proto
diff --git a/trezorlib/tests/device_tests/test_msg_getaddress_segwit_native.py b/trezorlib/tests/device_tests/test_msg_getaddress_segwit_native.py
index bc6c6e1b11..91f324d5aa 100644
--- a/trezorlib/tests/device_tests/test_msg_getaddress_segwit_native.py
+++ b/trezorlib/tests/device_tests/test_msg_getaddress_segwit_native.py
@@ -1,4 +1,20 @@
-import unittest
+# This file is part of the TREZOR project.
+#
+# Copyright (C) 2016-2017 Pavol Rusnak <stick@satoshilabs.com>
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
 from . import common
 import trezorlib.ckd_public as bip32
 from trezorlib import messages as proto
diff --git a/trezorlib/tests/device_tests/test_msg_getaddress_show.py b/trezorlib/tests/device_tests/test_msg_getaddress_show.py
index 773e52acf8..7dcbbd44a9 100644
--- a/trezorlib/tests/device_tests/test_msg_getaddress_show.py
+++ b/trezorlib/tests/device_tests/test_msg_getaddress_show.py
@@ -16,12 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import trezorlib.ckd_public as bip32
+import pytest
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestMsgGetaddressShow(common.TrezorTest):
 
     def test_show(self):
diff --git a/trezorlib/tests/device_tests/test_msg_getentropy.py b/trezorlib/tests/device_tests/test_msg_getentropy.py
index 578e0aaa7d..d55965484a 100644
--- a/trezorlib/tests/device_tests/test_msg_getentropy.py
+++ b/trezorlib/tests/device_tests/test_msg_getentropy.py
@@ -18,7 +18,6 @@
 
 from __future__ import print_function
 
-import unittest
 import math
 from . import common
 
diff --git a/trezorlib/tests/device_tests/test_msg_getpublickey.py b/trezorlib/tests/device_tests/test_msg_getpublickey.py
index 2714a18038..fd5c1cca39 100644
--- a/trezorlib/tests/device_tests/test_msg_getpublickey.py
+++ b/trezorlib/tests/device_tests/test_msg_getpublickey.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import trezorlib.ckd_public as bip32
 
diff --git a/trezorlib/tests/device_tests/test_msg_loaddevice.py b/trezorlib/tests/device_tests/test_msg_loaddevice.py
index 6958649132..114acfbb27 100644
--- a/trezorlib/tests/device_tests/test_msg_loaddevice.py
+++ b/trezorlib/tests/device_tests/test_msg_loaddevice.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 
 
diff --git a/trezorlib/tests/device_tests/test_msg_loaddevice_xprv.py b/trezorlib/tests/device_tests/test_msg_loaddevice_xprv.py
index 398d027b1c..313d4f1b29 100644
--- a/trezorlib/tests/device_tests/test_msg_loaddevice_xprv.py
+++ b/trezorlib/tests/device_tests/test_msg_loaddevice_xprv.py
@@ -16,10 +16,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 
 
+@pytest.mark.skip_t2
 class TestDeviceLoadXprv(common.TrezorTest):
 
     def test_load_device_xprv_1(self):
diff --git a/trezorlib/tests/device_tests/test_msg_nem_getaddress.py b/trezorlib/tests/device_tests/test_msg_nem_getaddress.py
index c8c3b8a6bf..c6138cd2ed 100644
--- a/trezorlib/tests/device_tests/test_msg_nem_getaddress.py
+++ b/trezorlib/tests/device_tests/test_msg_nem_getaddress.py
@@ -15,11 +15,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 import binascii
 
 
+@pytest.mark.skip_t2
 class TestMsgNEMGetaddress(common.TrezorTest):
 
     def test_nem_getaddress(self):
diff --git a/trezorlib/tests/device_tests/test_msg_nem_signtx.py b/trezorlib/tests/device_tests/test_msg_nem_signtx.py
index f1c276623b..01c4d3d673 100644
--- a/trezorlib/tests/device_tests/test_msg_nem_signtx.py
+++ b/trezorlib/tests/device_tests/test_msg_nem_signtx.py
@@ -15,9 +15,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
+import pytest
 
 from trezorlib import messages as proto
 
@@ -32,6 +32,7 @@ SIGNATURE_TESTNET_XEM_AS_MOSAIC = binascii.unhexlify(
 )
 
 
+@pytest.mark.skip_t2
 class TestMsgNEMSigntx(common.TrezorTest):
 
     def test_nem_signtx_simple(self):
diff --git a/trezorlib/tests/device_tests/test_msg_ping.py b/trezorlib/tests/device_tests/test_msg_ping.py
index 7b0e423511..c2929e4378 100644
--- a/trezorlib/tests/device_tests/test_msg_ping.py
+++ b/trezorlib/tests/device_tests/test_msg_ping.py
@@ -16,12 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
+import pytest
 
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestMsgPing(common.TrezorTest):
 
     def test_ping(self):
diff --git a/trezorlib/tests/device_tests/test_msg_recoverydevice.py b/trezorlib/tests/device_tests/test_msg_recoverydevice.py
index d713df49e0..e6457e5330 100644
--- a/trezorlib/tests/device_tests/test_msg_recoverydevice.py
+++ b/trezorlib/tests/device_tests/test_msg_recoverydevice.py
@@ -18,12 +18,12 @@
 
 from __future__ import print_function
 
-import unittest
 from . import common
-
+import pytest
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestMsgRecoverydevice(common.TrezorTest):
 
     def test_pin_passphrase(self):
diff --git a/trezorlib/tests/device_tests/test_msg_recoverydevice_dryrun.py b/trezorlib/tests/device_tests/test_msg_recoverydevice_dryrun.py
index f0c7ad1cb4..c0ad4cb894 100644
--- a/trezorlib/tests/device_tests/test_msg_recoverydevice_dryrun.py
+++ b/trezorlib/tests/device_tests/test_msg_recoverydevice_dryrun.py
@@ -18,12 +18,12 @@
 
 from __future__ import print_function
 
-import unittest
 from . import common
-
+import pytest
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestMsgRecoverydeviceDryrun(common.TrezorTest):
 
     def recovery_loop(self, mnemonic, result):
diff --git a/trezorlib/tests/device_tests/test_msg_resetdevice.py b/trezorlib/tests/device_tests/test_msg_resetdevice.py
index 58e03a8d94..f14ce6513c 100644
--- a/trezorlib/tests/device_tests/test_msg_resetdevice.py
+++ b/trezorlib/tests/device_tests/test_msg_resetdevice.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 
 from trezorlib import messages as proto
diff --git a/trezorlib/tests/device_tests/test_msg_resetdevice_skipbackup.py b/trezorlib/tests/device_tests/test_msg_resetdevice_skipbackup.py
index 380e91c8d4..78f13765e4 100644
--- a/trezorlib/tests/device_tests/test_msg_resetdevice_skipbackup.py
+++ b/trezorlib/tests/device_tests/test_msg_resetdevice_skipbackup.py
@@ -16,13 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
-
+import pytest
 from trezorlib import messages as proto
 from mnemonic import Mnemonic
 
 
+@pytest.mark.skip_t2
 class TestMsgResetDeviceSkipbackup(common.TrezorTest):
 
     def test_reset_device_skip_backup(self):
diff --git a/trezorlib/tests/device_tests/test_msg_signidentity.py b/trezorlib/tests/device_tests/test_msg_signidentity.py
index 7506b3f0aa..5bf321f749 100644
--- a/trezorlib/tests/device_tests/test_msg_signidentity.py
+++ b/trezorlib/tests/device_tests/test_msg_signidentity.py
@@ -18,7 +18,6 @@
 
 from __future__ import print_function
 
-import unittest
 import binascii
 import hashlib
 import struct
diff --git a/trezorlib/tests/device_tests/test_msg_signmessage.py b/trezorlib/tests/device_tests/test_msg_signmessage.py
index cacfddd54c..9a1b36bea5 100644
--- a/trezorlib/tests/device_tests/test_msg_signmessage.py
+++ b/trezorlib/tests/device_tests/test_msg_signmessage.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
 
diff --git a/trezorlib/tests/device_tests/test_msg_signmessage_segwit.py b/trezorlib/tests/device_tests/test_msg_signmessage_segwit.py
index 4f4db596f9..1de6386dc9 100644
--- a/trezorlib/tests/device_tests/test_msg_signmessage_segwit.py
+++ b/trezorlib/tests/device_tests/test_msg_signmessage_segwit.py
@@ -16,13 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
-
+import pytest
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestMsgSignmessageSegwit(common.TrezorTest):
 
     def test_sign(self):
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 53ad4f42c9..ec6bf87ef0 100644
--- a/trezorlib/tests/device_tests/test_msg_signmessage_segwit_native.py
+++ b/trezorlib/tests/device_tests/test_msg_signmessage_segwit_native.py
@@ -16,13 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
-
+import pytest
 from trezorlib import messages as proto
 
 
+@pytest.mark.skip_t2
 class TestMsgSignmessageSegwitNative(common.TrezorTest):
 
     def test_sign(self):
diff --git a/trezorlib/tests/device_tests/test_msg_signtx.py b/trezorlib/tests/device_tests/test_msg_signtx.py
index 91553c0da6..f859033bbc 100644
--- a/trezorlib/tests/device_tests/test_msg_signtx.py
+++ b/trezorlib/tests/device_tests/test_msg_signtx.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
 
@@ -356,7 +355,7 @@ class TestMsgSigntx(common.TrezorTest):
     def test_lots_of_inputs(self):
         self.setup_mnemonic_nopin_nopassphrase()
         # Tests if device implements serialization of len(inputs) correctly
-        # tx 4a7b7e0403ae5607e473949cfa03f09f2cd8b0f404bf99ce10b7303d86280bf7 : 100 UTXO for spending for unittests
+        # tx 4a7b7e0403ae5607e473949cfa03f09f2cd8b0f404bf99ce10b7303d86280bf7 : 100 UTXO for spending for unit tests
         inputs = []
         for i in range(100):
             inputs.append( proto.TxInputType(address_n=[4], # 1NwN6UduuVkJi6sw3gSiKZaCY5rHgVXC2h
diff --git a/trezorlib/tests/device_tests/test_msg_signtx_bch.py b/trezorlib/tests/device_tests/test_msg_signtx_bch.py
index 1d78f51967..02dea93823 100644
--- a/trezorlib/tests/device_tests/test_msg_signtx_bch.py
+++ b/trezorlib/tests/device_tests/test_msg_signtx_bch.py
@@ -15,10 +15,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
-
+import pytest
 from trezorlib import messages as proto
 from trezorlib.tx_api import TxApiInsight
 from trezorlib.ckd_public import deserialize
@@ -27,6 +26,7 @@ from trezorlib.client import CallException
 TxApiBitcoinCash = TxApiInsight(network='insight_bch', url='https://bch-bitcore2.trezor.io/api/')
 
 
+@pytest.mark.skip_t2
 class TestMsgSigntxBch(common.TrezorTest):
 
     def test_send_bch_change(self):
diff --git a/trezorlib/tests/device_tests/test_msg_signtx_decred.py b/trezorlib/tests/device_tests/test_msg_signtx_decred.py
index 4092dd9f6c..f66f04acd2 100644
--- a/trezorlib/tests/device_tests/test_msg_signtx_decred.py
+++ b/trezorlib/tests/device_tests/test_msg_signtx_decred.py
@@ -15,9 +15,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
+import pytest
 
 from trezorlib import messages as proto
 from trezorlib.tx_api import TxApiDecredTestnet
@@ -26,6 +26,8 @@ from trezorlib.tx_api import TxApiDecredTestnet
 TXHASH_e16248 = binascii.unhexlify("e16248f0b39a0a0c0e53d6f2f84c2a944f0d50e017a82701e8e02e46e979d5ed")
 
 
+@pytest.mark.skip_t1
+@pytest.mark.skip_t2
 class TestMsgSigntxDecred(common.TrezorTest):
 
     def test_send_decred(self):
diff --git a/trezorlib/tests/device_tests/test_msg_signtx_segwit.py b/trezorlib/tests/device_tests/test_msg_signtx_segwit.py
index 88cbb5989b..a416389d48 100644
--- a/trezorlib/tests/device_tests/test_msg_signtx_segwit.py
+++ b/trezorlib/tests/device_tests/test_msg_signtx_segwit.py
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
 
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 2bc8748841..706d76b743 100644
--- a/trezorlib/tests/device_tests/test_msg_signtx_segwit_native.py
+++ b/trezorlib/tests/device_tests/test_msg_signtx_segwit_native.py
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
 
diff --git a/trezorlib/tests/device_tests/test_msg_signtx_zcash.py b/trezorlib/tests/device_tests/test_msg_signtx_zcash.py
index f5fb4d1f60..d6f1c270ad 100644
--- a/trezorlib/tests/device_tests/test_msg_signtx_zcash.py
+++ b/trezorlib/tests/device_tests/test_msg_signtx_zcash.py
@@ -16,11 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-'''
-import unittest
+
 from . import common
 import binascii
-
+import pytest
 from trezorlib import messages as proto
 from trezorlib.tx_api import TxApiZcash
 
@@ -28,6 +27,8 @@ from trezorlib.tx_api import TxApiZcash
 TXHASH_93373e = binascii.unhexlify('93373e63cc626c4a7d049ad775d6511bb5eba985f142db660c9b9f955c722f5c')
 
 
+@pytest.mark.skip_t1
+@pytest.mark.skip_t2
 class TestMsgSigntxZcash(common.TrezorTest):
 
     def test_one_one_fee(self):
@@ -72,4 +73,3 @@ class TestMsgSigntxZcash(common.TrezorTest):
 
         # Accepted by network: tx dcc2a10894e0e8a785c2afd4de2d958207329b9acc2b987fd768a09c5efc4547
         self.assertEqual(binascii.hexlify(serialized_tx), b'01000000015c2f725c959f9b0c66db42f185a9ebb51b51d675d79a047d4a6c62cc633e3793000000006a4730440220670b2b63d749a7038f9aea6ddf0302fe63bdcad93dafa4a89a1f0e7300ae2484022002c50af43fd867490cea0c527273c5828ff1b9a5115678f155a1830737cf29390121030e669acac1f280d1ddf441cd2ba5e97417bf2689e4bbec86df4f831bf9f7ffd0ffffffff0128c55b07000000001976a9145b157a678a10021243307e4bb58f36375aa80e1088ac00000000')
-'''
diff --git a/trezorlib/tests/device_tests/test_msg_verifymessage.py b/trezorlib/tests/device_tests/test_msg_verifymessage.py
index 7dcbed72a6..c4cfd96d28 100644
--- a/trezorlib/tests/device_tests/test_msg_verifymessage.py
+++ b/trezorlib/tests/device_tests/test_msg_verifymessage.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
 import base64
diff --git a/trezorlib/tests/device_tests/test_msg_verifymessage_segwit.py b/trezorlib/tests/device_tests/test_msg_verifymessage_segwit.py
index 6c68831266..832e4dcb75 100644
--- a/trezorlib/tests/device_tests/test_msg_verifymessage_segwit.py
+++ b/trezorlib/tests/device_tests/test_msg_verifymessage_segwit.py
@@ -16,12 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
 import base64
+import pytest
 
 
+@pytest.mark.skip_t2
 class TestMsgVerifymessageSegwit(common.TrezorTest):
 
     def test_message_long(self):
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 d0ed88f329..7aecb6211c 100644
--- a/trezorlib/tests/device_tests/test_msg_verifymessage_segwit_native.py
+++ b/trezorlib/tests/device_tests/test_msg_verifymessage_segwit_native.py
@@ -16,12 +16,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
 import base64
+import pytest
 
 
+@pytest.mark.skip_t2
 class TestMsgVerifymessageSegwitNative(common.TrezorTest):
 
     def test_message_long(self):
diff --git a/trezorlib/tests/device_tests/test_msg_wipedevice.py b/trezorlib/tests/device_tests/test_msg_wipedevice.py
index 17dc602824..db7a6024b6 100644
--- a/trezorlib/tests/device_tests/test_msg_wipedevice.py
+++ b/trezorlib/tests/device_tests/test_msg_wipedevice.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 
 from trezorlib import messages as proto
diff --git a/trezorlib/tests/device_tests/test_multisig.py b/trezorlib/tests/device_tests/test_multisig.py
index 8dc3d83c13..cdfc8c0e28 100644
--- a/trezorlib/tests/device_tests/test_multisig.py
+++ b/trezorlib/tests/device_tests/test_multisig.py
@@ -18,10 +18,9 @@
 
 from __future__ import print_function
 
-import unittest
 from . import common
 import binascii
-
+import pytest
 from trezorlib import messages as proto
 import trezorlib.ckd_public as bip32
 from trezorlib.client import CallException
@@ -36,6 +35,7 @@ TXHASH_c6091a = binascii.unhexlify('c6091adf4c0c23982a35899a6e58ae11e703eacd7954
 #
 
 
+@pytest.mark.skip_t2
 class TestMultisig(common.TrezorTest):
 
     def test_2_of_3(self):
diff --git a/trezorlib/tests/device_tests/test_multisig_change.py b/trezorlib/tests/device_tests/test_multisig_change.py
index fad54cc842..7598b3fe1f 100644
--- a/trezorlib/tests/device_tests/test_multisig_change.py
+++ b/trezorlib/tests/device_tests/test_multisig_change.py
@@ -16,15 +16,15 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
-
+import pytest
 from trezorlib import messages as proto
 import trezorlib.ckd_public as bip32
 from trezorlib import tx_api
 
 
+@pytest.mark.skip_t2
 class TestMultisigChange(common.TrezorTest):
 
     def setUp(self):
diff --git a/trezorlib/tests/device_tests/test_op_return.py b/trezorlib/tests/device_tests/test_op_return.py
index 09f5c3378d..6ab1f56591 100644
--- a/trezorlib/tests/device_tests/test_op_return.py
+++ b/trezorlib/tests/device_tests/test_op_return.py
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 import binascii
 from . import common
 
diff --git a/trezorlib/tests/device_tests/test_protect_call.py b/trezorlib/tests/device_tests/test_protect_call.py
index a25a3d0919..92bf5e9e34 100644
--- a/trezorlib/tests/device_tests/test_protect_call.py
+++ b/trezorlib/tests/device_tests/test_protect_call.py
@@ -19,15 +19,15 @@
 from __future__ import print_function
 
 import time
-import unittest
 from . import common
-
+import pytest
 from trezorlib import messages as proto
 from trezorlib.client import PinException, CallException
 
 # FIXME TODO Add passphrase tests
 
 
+@pytest.mark.skip_t2
 class TestProtectCall(common.TrezorTest):
 
     def _some_protected_call(self, button, pin, passphrase):
diff --git a/trezorlib/tests/device_tests/test_protection_levels.py b/trezorlib/tests/device_tests/test_protection_levels.py
index ee2c765fcf..a6a2611587 100644
--- a/trezorlib/tests/device_tests/test_protection_levels.py
+++ b/trezorlib/tests/device_tests/test_protection_levels.py
@@ -16,16 +16,16 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-import unittest
 from . import common
 import binascii
-
+import pytest
 from trezorlib import messages as proto
 
 
 TXHASH_d5f65e = binascii.unhexlify('d5f65ee80147b4bcc70b75e4bbf2d7382021b871bd8867ef8fa525ef50864882')
 
 
+@pytest.mark.skip_t2
 class TestProtectionLevels(common.TrezorTest):
 
     def test_initialize(self):
diff --git a/trezorlib/tests/device_tests/test_zerosig.py b/trezorlib/tests/device_tests/test_zerosig.py
index cff99050ad..36e919ef2e 100644
--- a/trezorlib/tests/device_tests/test_zerosig.py
+++ b/trezorlib/tests/device_tests/test_zerosig.py
@@ -18,7 +18,6 @@
 
 from __future__ import print_function
 
-import unittest
 import binascii
 import sys
 from . import common