diff --git a/.travis.yml b/.travis.yml
index de7abf0..b892211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,22 @@
 language: python
-python: "3.4"
+python: "3.5"
 cache: pip
 
 env:
     - TOXENV=py34
+    - TOXENV=py35
     - TOXENV=pep8
+
 install:
-    - pip install tox==1.9.2
+    - pip install tox
     - if [ "$TOXENV" = 'py34' ]; then pip install coveralls; fi
+
 script:
     - tox -e $TOXENV
+
 after_success:
     - if [ "$TOXENV" = 'py34' ]; then coveralls; fi
+
 deploy:
     provider: pypi
     user: seantis
diff --git a/tox.ini b/tox.ini
index 13db164..b3e676d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,pep8
+envlist = py34,py35,pep8
 
 [testenv]
 deps = setuptools==18.8.1