diff --git a/tools/test-requires b/tools/test-requires
index 738f456ca4..d43ec6b013 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -19,7 +19,9 @@ webtest # test wsgi apps without starting an http server
 distribute>=0.6.24
 
 # for python-keystoneclient
-httplib2
+httplib2 # keystoneclient <0.2.1
+requests<1.0 # replaces httplib2 in keystoneclient >=0.2.1
+keyring
 
 # swift_auth test dependencies
 http://tarballs.openstack.org/swift/swift-master.tar.gz#egg=swift
@@ -27,8 +29,3 @@ netifaces
 
 # For translations processing
 Babel
-
-requests<1.0
-
-# keyring is required by python-keystoneclient-master
-keyring
\ No newline at end of file