diff --git a/.travis.yml b/.travis.yml
index fead52f55d..425c29be76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - '3.3'
   - '3.4'
   - '3.5'
+  - '3.6'
 install:
   - pip install .
   - pip install -r requirements.txt
diff --git a/setup.py b/setup.py
index 8e1539623a..a9b3171997 100755
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@
         ':python_version=="3.3"': ['pysocks'],
         ':python_version=="3.4"': ['pysocks'],
         ':python_version=="3.5"': ['pysocks'],
+        ':python_version=="3.6"': ['pysocks'],
     },
     packages = find_packages(exclude=['docs', 'tests*']),
     include_package_data=True,
@@ -51,6 +52,7 @@
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Communications :: Telephony",
         ],
diff --git a/tox.ini b/tox.ini
index 51d8d59264..af208d611a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py32, py33, py34, py35, pypy
+envlist = py26, py27, py32, py33, py34, py35, py36, pypy
 
 [testenv]
 deps= -r{toxinidir}/tests/requirements.txt