2 files changed, 3 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 06cb5cbc..46be1b5b 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ See docs at http://packages.python.org/cmd2/
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-
+        'Programming Language :: Python :: 3.6',
     ],
-    )
+)
 
diff --git a/tox.ini b/tox.ini
index ed2d2e12..91ce4283 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,jython,pypy
+envlist = py27,py34,py35,py36,jython,pypy
 
 [testenv]
 deps =