diff --git a/.travis.yml b/.travis.yml
index f308dc37e..d4a585dd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
+sudo: true
+dist: xenial
 language: python
 python:
-  - "2.7"
-  - "3.6"
+  - "3.7"
 
 addons:
   apt:
diff --git a/tox.ini b/tox.ini
index 5809d87c6..1301b395e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,24 +1,24 @@
 [tox]
-envlist = py27-unit,py36-integration
+envlist = py37
 
 [testenv]
 deps =
+  pylint
   coverage
   ../torba
+  ../electrumx
   ../lbryschema
-  unit: pylint
-  integration: ../electrumx
-  integration: ../orchstr8
-  integration: ../lbryumx
+  ../lbryumx
+  ../orchstr8
 extras = test
 changedir = {toxinidir}/tests
 setenv =
   HOME=/tmp
   PYTHONHASHSEED=0
-  integration: LEDGER=lbrynet.wallet
+  LEDGER=lbrynet.wallet
 commands =
-  unit: pylint --rcfile=../.pylintrc ../lbrynet
-  unit: coverage run -p --source={envsitepackagesdir}/lbrynet -m twisted.trial functional unit
-  integration: orchstr8 download
-  integration: coverage run -p --source={envsitepackagesdir}/lbrynet -m twisted.trial --reactor=asyncio integration.wallet.test_transactions.BasicTransactionTest
-  integration: coverage run -p --source={envsitepackagesdir}/lbrynet -m twisted.trial --reactor=asyncio integration.wallet.test_commands.CommonWorkflowTests
+  pylint --rcfile=../.pylintrc ../lbrynet
+  coverage run -p --source={envsitepackagesdir}/lbrynet -m twisted.trial functional unit
+  orchstr8 download
+  coverage run -p --source={envsitepackagesdir}/lbrynet -m twisted.trial --reactor=asyncio integration.wallet.test_transactions.BasicTransactionTest
+  coverage run -p --source={envsitepackagesdir}/lbrynet -m twisted.trial --reactor=asyncio integration.wallet.test_commands.CommonWorkflowTests