diff --git a/.travis.yml b/.travis.yml
index 7e7d70aea..9f952e6fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
     - 3.3
     - 3.4
     - 3.5
+    - 3.6
 
 env:
     - BUILD=tests
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d00ab6d47..f1ac456a1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -16,6 +16,8 @@ released 2017-01-25
   were treated as if they were in the system's local time, not as if they are in
   the (possibly) configured default_timezone.
 
+* python 3.6 is now officially supported
+
 0.9.0
 =====
 released 2017-01-24
diff --git a/setup.py b/setup.py
index ce46d2782..5e961cadb 100755
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Utilities",
         "Topic :: Communications",
diff --git a/tox.ini b/tox.ini
index c57c3c751..fdf4a6aea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py33, py34, py35}-{tests, tests-negtz, style}
+envlist = {py33, py34, py35, py36}-{tests, tests-negtz, style}
 skip_missing_interpreters = True
 
 [testenv]