diff --git a/.travis.yml b/.travis.yml
index 6e3073f..ddf968c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
   - "pypy"
   - "pypy3"
 
diff --git a/setup.py b/setup.py
index 376afa1..65ec27f 100644
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,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 :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy"
     ],
diff --git a/tox.ini b/tox.ini
index 01c99b5..abbdf5d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py32,py33,py34,py35,pypy,pypy3
+envlist = py27,py32,py33,py34,py35,py36,pypy,pypy3
 
 [testenv]
 deps = pytest