1 files changed, 8 insertions, 11 deletions
diff --git a/tox.ini b/tox.ini
index cd4ff27..0d9783b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,11 +4,13 @@ skipsdist = True
 envlist =
     pep8,
     py27,
-    py27-gevent,
-    py27-eventlet,
+    py27-{gevent,eventlet,sasl},
     py34,
+    py34-sasl,
     py35,
+    py35-sasl,
     py36,
+    py36-{sasl,docs},
     pypy
 
 [testenv:pep8]
@@ -21,17 +23,12 @@ setenv =
     VIRTUAL_ENV={envdir}
     ZOOKEEPER_VERSION={env:ZOOKEEPER_VERSION:}
 deps = -r{toxinidir}/requirements.txt
-    -r{toxinidir}/requirements_sphinx.txt
+    docs: -r{toxinidir}/requirements_sphinx.txt
+    gevent: -r{toxinidir}/requirements_gevent.txt
+    sasl: -r{toxinidir}/requirements_sasl.txt
+    eventlet: -r{toxinidir}/requirements_eventlet.txt
 commands = {toxinidir}/ensure-zookeeper-env.sh nosetests {posargs: -d -v --with-coverage kazoo.tests}
 
-[testenv:py27-gevent]
-deps = {[testenv]deps}
-    -r{toxinidir}/requirements_gevent.txt
-
-[testenv:py27-eventlet]
-deps = {[testenv]deps}
-    -r{toxinidir}/requirements_eventlet.txt
-
 [flake8]
 builtins = _
 exclude = .venv,.tox,dist,doc,*egg,.git,build,tools,local,docs,zookeeper