diff --git a/.travis.yml b/.travis.yml
index 8c6d62a4..44c689d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 
 notifications:
   email: false
diff --git a/setup.py b/setup.py
index 4d232776..03cd536a 100755
--- a/setup.py
+++ b/setup.py
@@ -180,6 +180,7 @@ def getq(self, s, k, fallback):
                            "Programming Language :: Python :: 3.3",
                            "Programming Language :: Python :: 3.4",
                            "Programming Language :: Python :: 3.5",
+                           "Programming Language :: Python :: 3.6",
                            "Intended Audience :: Science/Research",
                            "License :: OSI Approved",
                            "Topic :: Software Development :: Libraries :: Python Modules"],