diff --git a/requirements-py3.txt b/requirements-py3.txt
index b61b75b7..7746e00b 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -6,10 +6,7 @@ Babel>=1.3
 stevedore>=1.3.0  # Apache-2.0
 six>=1.9.0
 iso8601>=0.1.9
-kazoo>=1.3.1
-pymemcache>=1.2  # Apache 2.0 License
 zake>=0.1.6 # Apache-2.0
 msgpack-python>=0.4.0
 retrying>=1.2.3,!=1.3.0 # Apache-2.0
 oslo.utils>=1.4.0                       # Apache-2.0
-redis>=2.10.0
diff --git a/requirements.txt b/requirements.txt
index e995b543..1f34e92e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,11 +6,8 @@ Babel>=1.3
 stevedore>=1.3.0  # Apache-2.0
 six>=1.9.0
 iso8601>=0.1.9
-kazoo>=1.3.1
-pymemcache>=1.2  # Apache 2.0 License
 zake>=0.1.6 # Apache-2.0
 msgpack-python>=0.4.0
 retrying>=1.2.3,!=1.3.0 # Apache-2.0
 futures>=2.1.6
 oslo.utils>=1.4.0                       # Apache-2.0
-redis>=2.10.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 56264a1e..0ea95ac1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
+
 pep8==1.5.7
 pyflakes==0.8.1
 flake8==2.2.4
@@ -13,7 +14,12 @@ testrepository>=0.0.18
 testtools>=0.9.36,!=1.2.0
 testscenarios>=0.4
 coverage>=3.6
+fixtures>=0.3.14
+
+# All the various optional drivers require these...
 psycopg2
 PyMySQL>=0.6.2  # MIT License
 sysv_ipc>=0.6.8  # BSD License
-fixtures>=0.3.14
+kazoo>=1.3.1
+pymemcache>=1.2  # Apache 2.0 License
+redis>=2.10.0