diff --git a/.travis.yml b/.travis.yml
index ea8e7fac63ea1181e9a1a95c94b5bf4596577bdc..cc9158bc6582ba424e94025de567d8432c70971e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ sudo: false
 language: python
 
 python:
+  - 3.6
   - 3.5
   - 3.4
   - 3.3
diff --git a/setup.py b/setup.py
index 1c275230943115fe3d76873829dbbf8bfefe4a8b..007629d0ca9e9083ad35d606d1e4cd84176eada5 100644
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,7 @@ setup(
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Communications',
         'Topic :: Internet',
     ],