diff --git a/trezorlib/tests/device_tests/common.py b/trezorlib/tests/device_tests/common.py
index 77c5eebd4a..0a6845721e 100644
--- a/trezorlib/tests/device_tests/common.py
+++ b/trezorlib/tests/device_tests/common.py
@@ -83,8 +83,8 @@ def get_transport():
         debuglink = PipeTransport('/tmp/pipe.trezor_debug', False)
 
     elif UDP_ENABLED:
-        wirelink = UdpTransport()
-        debuglink = UdpTransport()
+        wirelink = UdpTransport('127.0.0.1:21324')
+        debuglink = UdpTransport('127.0.0.1:21325')
 
     return wirelink, debuglink
 
diff --git a/trezorlib/transport_udp.py b/trezorlib/transport_udp.py
index dc6be3dd5d..ad520f8d5f 100644
--- a/trezorlib/transport_udp.py
+++ b/trezorlib/transport_udp.py
@@ -43,13 +43,6 @@ class UdpTransport(Transport):
             host = devparts[0]
             port = int(devparts[1]) if len(devparts) > 1 else UdpTransport.DEFAULT_PORT
         if not protocol:
-            '''
-            force_v1 = os.environ.get('TREZOR_TRANSPORT_V1', '0')
-            if not int(force_v1):
-                protocol = ProtocolV2()
-            else:
-                protocol = ProtocolV1()
-            '''
             protocol = ProtocolV1()
         self.device = (host, port)
         self.protocol = protocol