diff --git a/.travis.yml b/.travis.yml
index 926b3ab..b6a7fd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ python:
     - "2.6"
     - "2.7"
     - "3.4"
+    - "3.5"
 install:
-    - pip install tox codecov
+    - pip install tox tox-travis codecov
 script:
     - tox
 after_success:
diff --git a/setup.cfg b/setup.cfg
index 1bf1916..e761aca 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,9 +13,12 @@ classifier =
     License :: OSI Approved :: GNU General Public License v2 (GPLv2)
     Operating System :: POSIX
     Programming Language :: Python
+    Programming Language :: Python :: 2
     Programming Language :: Python :: 2.6
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
     Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
 keywords =
     remote
     resource
diff --git a/tox.ini b/tox.ini
index 7db2330..b0c54fe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,10 @@
 [tox]
-envlist = py26,py27,py34,pep8
+envlist = py26,py27,py34,py35,pep8
+[tox:travis]
+2.6 = py26, pep8
+2.7 = py27, pep8
+3.4 = py34, pep8
+3.5 = py35, pep8
 [testenv]
 deps = -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/requirements.txt