diff --git a/.travis.yml b/.travis.yml
index 02c8574..828a7a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
+dist: xenial
 language: python
 python:
   - "2.7"
   - "3.5"
+  - "3.6"
+  - "3.7"
 install: "pip install -r requirements.txt"
 script: "python setup.py test"
diff --git a/docs/index.rst b/docs/index.rst
index e69830f..6169024 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -69,7 +69,7 @@ Features
   function output.
 * Simple :class:`WSGI middleware <htmlmin.middleware.HTMLMinMiddleware>` to
   minify web app output.
-* `Tested <https://travis-ci.org/mankyd/htmlmin>`_ in both Python 2.7 and 3.2: 
+* `Tested <https://travis-ci.org/mankyd/htmlmin>`_ on Python 2.7 and 3.5+:
   |build_status|
 
 .. |build_status| image:: https://travis-ci.org/mankyd/htmlmin.png?branch=master
diff --git a/setup.py b/setup.py
index 865837e..d8beaee 100644
--- a/setup.py
+++ b/setup.py
@@ -30,8 +30,12 @@
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Topic :: Text Processing :: Markup :: HTML",
     ],
     entry_points={
diff --git a/tox.ini b/tox.ini
index 58340bf..0c8ad46 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=py27, py33, py34
+envlist=py{27,35,36,37}
 
 [testenv]
 commands=python setup.py test