diff --git a/.travis.yml b/.travis.yml
index 20f62692e..2bfb24ae4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,20 +17,20 @@ jobs:
         - mypy torba
       after_success: skip
 
-    - &unit-tests
-      stage: unit tests
+    - &tests
+      stage: tests
+      env: TESTTYPE=unit
       install:
         - pip install tox-travis
-      script: TESTTYPE=unit tox
-    - <<: *unit-tests
+      script: tox
+    - <<: *tests
       python: "3.6"
-
-    - stage: integration tests
+    - <<: *tests
+      env: TESTTYPE=integration
       install:
         - pip install tox-travis
         - pushd .. && git clone https://github.com/lbryio/electrumx.git --branch lbryumx && popd
         - pushd .. && git clone https://github.com/lbryio/orchstr8.git && popd
-      script: TESTTYPE=integration tox
 
 after_success:
   - pip install coverage
diff --git a/tox.ini b/tox.ini
index 7037984db..1eb951d74 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 #envlist = unit,integration-{torba.coin.bitcoincash,torba.coin.bitcoinsegwit}
-envlist = py37-unit,py37-integration-torba.coin.bitcoinsegwit
+envlist = py{37,36}-unit,py37-integration-torba.coin.bitcoinsegwit
 
 [travis:env]
 TESTTYPE =