diff --git a/.travis.yml b/.travis.yml
index 7b1ace83c..d63a1e332 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,11 @@ install:
     # Optimisation: build requirements as wheels, which get cached by Travis
     - pip install "pip>=7.0" wheel
     - pip install "setuptools>=19.0"
+    - pip install tox-travis
 
 script:
     - python setup.py install
+    - tox
 
 notifications:
   webhooks:
diff --git a/tox.ini b/tox.ini
index 86ddf44bc..cfdc7cb9f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,23 +1,6 @@
-# To test against multiple python versions
-#
-#  1. Install those Python versions.
-#     On Ubuntu we suggest the deadsnakes PPA
-#     https://launchpad.net/~fkrull/+archive/ubuntu/deadsnakes
-#
-#  2. Install Tox (e.g. with pip)
-#         pip install Tox
-#
-#  3. Run Tox
-#         tox
-
 [tox]
-envlist =
-    py27,
-    py34,
-    py35,
+envlist = py27,py34,py35,py36
 
 [testenv]
-deps =
-    -rrequirements.txt
-commands =
-    python -m compileall trezorlib/
+deps = -rrequirements.txt
+commands = python -m compileall trezorlib/