diff --git a/.travis.yml b/.travis.yml
index 9c50862..219cc33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,13 @@
 language: python
-python: 3.5
-env:
-  # Avoid testing pypy on travis until the following issue is fixed:
-  #   https://github.com/travis-ci/travis-ci/issues/4756
-  #- TOX_ENV=pypy
-  - TOX_ENV=py35
-  - TOX_ENV=py34
-  - TOX_ENV=py33
-  - TOX_ENV=py27
-  - TOX_ENV=docs
+python:
+  - pypy
+  - pypy3.3-5.2-alpha1
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
 install:
-  - pip install coveralls tox
-script: tox -e  $TOX_ENV
+  - pip install coveralls tox-travis
+script: tox
 after_success: coveralls
diff --git a/setup.py b/setup.py
index c17939a..f931edb 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,7 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: PyPy'
     ),
 )
diff --git a/tox.ini b/tox.ini
index 279b114..f8a6d07 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,25 +1,8 @@
 [tox]
-envlist = pypy,py35,py34,py33,py27,docs
+envlist = pypy-test,pypy3-test,py36-test,py35-test,py34-test,py33-test,py27-test,py36-docs
 
 [testenv]
-commands = coverage run --source=fitbit setup.py test
+commands =
+  test: coverage run --source=fitbit setup.py test
+  docs: sphinx-build -W -b html docs docs/_build
 deps = -r{toxinidir}/requirements/test.txt
-
-[testenv:pypy]
-basepython = pypy
-
-[testenv:py35]
-basepython = python3.5
-
-[testenv:py34]
-basepython = python3.4
-
-[testenv:py33]
-basepython = python3.3
-
-[testenv:py27]
-basepython = python2.7
-
-[testenv:docs]
-basepython = python3.4
-commands = sphinx-build -W -b html docs docs/_build