diff --git a/setup.py b/setup.py
index 8d69808b..5edde148 100644
--- a/setup.py
+++ b/setup.py
@@ -71,6 +71,7 @@ def run_tests(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 :: PyPy',
         'License :: OSI Approved :: MIT License',
         'Topic :: Database :: Front-Ends',
diff --git a/tox.ini b/tox.ini
index a4534498..5fd35571 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8,isort,py27,py33,py34,py35,pre-commit,pypy,docs
+envlist = flake8,isort,py27,py33,py34,py35,py36,pre-commit,pypy,docs
 
 [testenv]
 deps =
@@ -11,7 +11,7 @@ deps =
     pytest-benchmark
 commands =
     py{27,33,34,py}: py.test graphql tests {posargs}
-    py35: py.test graphql tests tests_py35 {posargs}
+    py{35,36}: py.test graphql tests tests_py35 {posargs}
 
 [testenv:pre-commit]
 basepython=python3.6