diff --git a/.travis.yml b/.travis.yml
index cdb6635..237eccc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@
       env: TOXENV=py34
     - python: 3.5
       env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
     - python: pypy
       env: TOXENV=pypy PYPY_VERSION=5.1
 
diff --git a/setup.py b/setup.py
index 9dc5e8d..2570870 100644
--- a/setup.py
+++ b/setup.py
@@ -27,10 +27,14 @@
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 2.6",
     "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 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 :: Libraries :: Python Modules",
     "Topic :: Text Processing :: Markup",
 ]
diff --git a/tox.ini b/tox.ini
index 5a1ba14..517dbc3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py33,py34,py35,
+envlist = py26,py27,pypy,py33,py34,py35,py36
 
 [testenv]
 deps =