3 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2dcb793..3809135 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,10 @@ matrix:
       env: TOXENV=py33
     - python: '3.4'
       env: TOXENV=py34
+    - python: '3.5'
+      env: TOXENV=py35
+    - python: '3.6'
+      env: TOXENV=py36
     - python: 'pypy'
       env: TOXENV=pypy
     - env: TOXENV=flake8
diff --git a/setup.py b/setup.py
index e4b68f9..3821c6c 100755
--- a/setup.py
+++ b/setup.py
@@ -263,6 +263,8 @@ setup(
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Communications :: Email :: Filters',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries',
         'Topic :: Internet :: WWW/HTTP :: Site Management',
diff --git a/tox.ini b/tox.ini
index 3292773..33e0f57 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py32, py33, py34, pypy, flake8, checkspelling
+envlist = py27, py32, py33, py34, py35, py36, pypy, flake8, checkspelling
 
 [testenv]
 deps = -rtest-requirements.txt