diff --git a/.travis.yml b/.travis.yml
index d5d976c..0ed7664 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,26 @@ python: 2.7
 
 sudo: false
 
-env:
-  - TOX_ENV=py26
-  - TOX_ENV=py27
-  - TOX_ENV=py33
-  - TOX_ENV=py34
-  - TOX_ENV=pypy
+matrix:
+  include:
+  - python: 2.6
+    env: TOX_ENV=py26
+  - python: 2.7
+    env: TOX_ENV=py27
+  - python: 3.3
+    env: TOX_ENV=py33
+  - python: 3.4
+    env: TOX_ENV=py34
+  - python: 3.5
+    env: TOX_ENV=py35
+  - python: 3.6
+    env: TOX_ENV=py36
+  - python: pypy
+    env: TOX_ENV=pypy
 
 install:
   # Install tox and flake8 style checker
-  - pip install tox==1.7.2 flake8==2.1.0
+  - pip install tox==2.9.1 flake8==2.1.0
 
 script:
   # Run the library through flake8
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 4d3e4f5..1b7464b 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,4 +3,4 @@
 
 # Additional requirements for development
 sphinx==1.2.1
-tox==1.7.2
+tox==2.9.1
diff --git a/requirements-test.txt b/requirements-test.txt
index 2a9855f..c86db9a 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -2,9 +2,9 @@
 -e .
 
 # Additional requirements for running the testsuite
-pytest==2.6.2
+pytest==3.2.3
 coverage==3.7.1
-pytest-cov==1.8.0
+pytest-cov==2.5.1
 flake8==2.1.0
 freezegun==0.3.8
 six==1.10
diff --git a/tox.ini b/tox.ini
index 6d5f081..9cc0854 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, pypy
+envlist = py26, py27, py33, py34, py35, py36, pypy
 skipsdist = True
 
 [testenv]