diff --git a/.travis.yml b/.travis.yml
index b24d042..9d57e1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env:
     - TOXENV=py33
     - TOXENV=py34
     - TOXENV=py35
+    - TOXENV=py36
     - TOXENV=pypy
     - TOXENV=flake8
     - TOXENV=coverage
diff --git a/setup.cfg b/setup.cfg
index a1a6493..30f7f6a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,9 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 test_suite = requests_unixsocket.tests
 
 [files]
diff --git a/tox.ini b/tox.ini
index d2caddd..e94d499 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py33, py34, py35, pypy, flake8
+envlist = py27, py33, py34, py35, py36, pypy, flake8
 
 [testenv]
 commands = py.test {posargs:requests_unixsocket/tests}