diff --git a/.travis.yml b/.travis.yml
index e2d94c009..59184a49d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
+  - "pypy"
+  - "pypy3"
 cache: pip
 # install libjpeg-dev for Pillow to handle JPEGs
 sudo: false
diff --git a/setup.cfg b/setup.cfg
index 3d0d4ec72..0533d74bc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,7 @@ classifier =
     Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
     Operating System :: OS Independent
 
 [files]
diff --git a/tox.ini b/tox.ini
index f6964d770..3894c0893 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, flake8
+envlist = py27, py35, py36, flake8
 
 [testenv]
 commands =