diff --git a/.travis.yml b/.travis.yml
index 729f446..e72ef06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,27 +10,27 @@ matrix:
         - python: "2.6"
           env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26
         - python: "2.6"
-          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent-0.13.8
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent
         - python: "2.6"
-          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent-0.13.8
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent
         - python: "2.6"
-          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent-1.0.1
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-eventlet
         - python: "2.6"
-          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent-1.0.1
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-eventlet
         - python: "2.7"
           env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
         - python: "2.7"
           env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27
         - python: "2.7"
-          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent-0.13.8
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent
         - python: "2.7"
-          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-gevent-0.13.8
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-gevent
         - python: "2.7"
-          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent-1.0.1
+          env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-eventlet
         - python: "2.7"
-          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-gevent-1.0.1
+          env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-eventlet
         - python: "2.7"
-          env: ZOOKEEPER_VERSION=3.5.0-alpha TOX_VENV=py27-gevent-1.0.1
+          env: ZOOKEEPER_VERSION=3.5.0-alpha TOX_VENV=py27-gevent
         - python: "3.3"
           env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py33
         - python: "3.3"
diff --git a/requirements_gevent.txt b/requirements_gevent.txt
index 2a4e627..4a63abe 100644
--- a/requirements_gevent.txt
+++ b/requirements_gevent.txt
@@ -1 +1 @@
-greenlet==0.4.3
+gevent
diff --git a/tox.ini b/tox.ini
index af3e7a6..dc25be9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,11 +3,11 @@ minversion = 1.6
 skipsdist = True
 envlist = pep8,
     py26,
-    py26-gevent-0.13.8,
-    py26-gevent-1.0.1,
+    py26-gevent,
+    py26-eventlet,
     py27,
-    py27-gevent-0.13.8,
-    py27-gevent-1.0.1,
+    py27-gevent,
+    py27-eventlet,
     py33,
     py34,
     pypy
@@ -23,39 +23,21 @@ deps = -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements_sphinx.txt
 commands = {toxinidir}/ensure-zookeeper-env.sh nosetests {posargs: -d -v --with-coverage kazoo.tests}
 
-[testenv:py27]
+[testenv:py27-gevent]
 deps = {[testenv]deps}
     -r{toxinidir}/requirements_gevent.txt
+
+[testenv:py27-eventlet]
+deps = {[testenv]deps}
     -r{toxinidir}/requirements_eventlet.txt
-    gevent
 
-[testenv:py27-gevent-0.13.8]
+[testenv:py26-gevent]
 deps = {[testenv]deps}
     -r{toxinidir}/requirements_gevent.txt
-    gevent==0.13.8
 
-[testenv:py27-gevent-1.0.1]
+[testenv:py26-eventlet]
 deps = {[testenv]deps}
-    -r{toxinidir}/requirements_gevent.txt
-    gevent==1.0.1
-
-[testenv:py26]
-deps = {[testenv]deps}
-    -r{toxinidir}/requirements_gevent.txt
     -r{toxinidir}/requirements_eventlet.txt
-    gevent
-
-[testenv:py26-gevent-0.13.8]
-deps = {[testenv]deps}
-    -r{toxinidir}/requirements_gevent.txt
-    -r{toxinidir}/requirements_eventlet.txt
-    gevent==0.13.8
-
-[testenv:py26-gevent-1.0.1]
-deps = {[testenv]deps}
-    -r{toxinidir}/requirements_gevent.txt
-    -r{toxinidir}/requirements_eventlet.txt
-    gevent==1.0.1
 
 [flake8]
 builtins = _