diff --git a/.gitmodules b/.gitmodules
index 7b3b203..920894a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,3 @@
 [submodule "vendor/nanopb"]
 	path = vendor/nanopb
 	url = https://github.com/nanopb/nanopb.git
-[submodule "python-trezor"]
-	path = vendor/python-trezor
-	url = https://github.com/trezor/python-trezor.git
diff --git a/.travis.yml b/.travis.yml
index 94f1ce8..34a15cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,10 @@ matrix:
         - EMULATOR=1 HEADLESS=1
         - DEBUG_LINK=1
       before_script:
-        - sed -i '/hidapi/d' "vendor/python-trezor/requirements.txt"
-        - pip install --user --requirement "vendor/python-trezor/requirements.txt" rlp pytest requests[security]
-        - pip install --user --no-deps "vendor/python-trezor"
+        - pip install --user pytest
+        - pip install --user ecdsa mnemonic
+        - pip install --user rlp requests[security]
+        - pip install --user --no-deps git+https://github.com/trezor/python-trezor@master
       script:
         - script/cibuild
         - script/test
diff --git a/script/test b/script/test
index 9306b7d..460b711 100755
--- a/script/test
+++ b/script/test
@@ -6,6 +6,10 @@ set -e
 
 cd "$(dirname "$0")/.."
 
+if [ \! -d device_tests ]; then
+    curl -s -L https://github.com/trezor/python-trezor/archive/master.tar.gz | tar -xvz --strip-components=2 python-trezor-master/tests/device_tests
+fi
+
 # Kill jobs on exit
 trap "exit" INT TERM
 trap "kill 0" EXIT
@@ -14,7 +18,7 @@ if [ "$EMULATOR" = 1 ] && [ -z "$(pidof trezor.elf)" ]; then
     firmware/trezor.elf &
 fi
 
-TREZOR_TRANSPORT_V1=1 pytest "vendor/python-trezor/tests/device_tests" &
+TREZOR_TRANSPORT_V1=1 pytest "device_tests" &
 
 # Wait for either job to exit and kill the other
 wait -n
diff --git a/vendor/python-trezor b/vendor/python-trezor
deleted file mode 160000
index 90c49e3..0000000
--- a/vendor/python-trezor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 90c49e3386ee9391c2a57e2ca0a40f8a909a47cc