diff --git a/.travis.yml b/.travis.yml
index 68cbe27..9d8e28d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,8 @@ matrix:
       env: TOXENV=py34
     - python: 3.5
       env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
     - python: pypy
       env: TOXENV=pypy
 notifications:
diff --git a/setup.py b/setup.py
index 04ec319..613ef8d 100644
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,7 @@ def run(self):
           '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',
           'Topic :: Software Development',
diff --git a/tox.ini b/tox.ini
index 6de794d..f0755d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    coveralls, pylint, flake8, pydocstyle, py26, py27, py33, py34, py35, pypy
+    coveralls, pylint, flake8, pydocstyle, py26, py27, py33, py34, py35, py36, pypy
 
 [testenv]
 whitelist_externals=