2 files changed, 3 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 4255f6d..6a28ba4 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,8 @@ setup(name="Routes",
                    "Programming Language :: Python :: 3.2",
                    "Programming Language :: Python :: 3.3",
                    "Programming Language :: Python :: 3.4",
-                   "Programming Language :: Python :: 3.5"
+                   "Programming Language :: Python :: 3.5",
+                   "Programming Language :: Python :: 3.6"
                    ],
       keywords='routes webob dispatch',
       author="Ben Bangert",
diff --git a/tox.ini b/tox.ini
index f936dbe..0988735 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,py34,py35,pypy,pypy3
+envlist = py26,py27,py33,py34,py35,py36,pypy,pypy3
 
 [testenv]
 deps=