diff --git a/tox.ini b/tox.ini
index 03a6893..a87e646 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ deps =
     pytest
     pytest-cov
     pytest-catchlog
-    py{27,34,35,py}: pytest-pylint
+    py{27,34,35,36,py}: pytest-pylint
     pytest-sugar
     pytest-mock
     mock
@@ -30,11 +30,6 @@ passenv = KAFKA_VERSION
 # pylint doesn't support python2.6
 commands = py.test {posargs:--cov=kafka --cov-config=.covrc}
 
-[testenv:py36]
-# pylint doesn't support python3.6 yet
-# https://github.com/PyCQA/pylint/issues/1072
-commands = py.test {posargs:--cov=kafka --cov-config=.covrc}
-
 [testenv:pypy]
 # pylint is super slow on pypy...
 commands = py.test {posargs:--cov=kafka --cov-config=.covrc}