diff --git a/.travis.yml b/.travis.yml
index 7c46a5cd..b1fd9439 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: python
 python:
   - '2.7'
+  - '3.4'
+  - '3.5'
   - '3.6'
-  - nightly
+  - '3.7'
 addons:
   hosts:
     - riak-test
diff --git a/setup.py b/setup.py
index 37eb8da0..5a259e61 100755
--- a/setup.py
+++ b/setup.py
@@ -58,8 +58,9 @@
                  'Intended Audience :: Developers',
                  'Operating System :: OS Independent',
                  'Programming Language :: Python :: 2.7',
-                 'Programming Language :: Python :: 3.3',
                  'Programming Language :: Python :: 3.4',
                  'Programming Language :: Python :: 3.5',
+                 'Programming Language :: Python :: 3.6',
+                 'Programming Language :: Python :: 3.7',
                  'Topic :: Database']
     )
diff --git a/tox.ini b/tox.ini
index f411b799..5b9d1056 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,12 +3,10 @@
 # test suite on all supported python versions.
 
 [tox]
-envlist = py2, py3
+envlist = py{27,34,35,36,37}
 
 [testenv]
-install_command = pip install --upgrade {packages}
 commands = {envpython} setup.py test
 deps =
-    pip
     pytz
 passenv = RUN_* SKIP_* RIAK_*