diff --git a/etc/glance-api-paste.ini b/etc/glance-api-paste.ini
index 0cd2d15773..0b29bc9d56 100644
--- a/etc/glance-api-paste.ini
+++ b/etc/glance-api-paste.ini
@@ -53,5 +53,5 @@ paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
 paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
 
 [filter:authtoken]
-paste.filter_factory = keystone.middleware.auth_token:filter_factory
+paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 delay_auth_decision = true
diff --git a/etc/glance-registry-paste.ini b/etc/glance-registry-paste.ini
index aea93eec7c..5519c5cc56 100644
--- a/etc/glance-registry-paste.ini
+++ b/etc/glance-registry-paste.ini
@@ -16,4 +16,4 @@ paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
 paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
 
 [filter:authtoken]
-paste.filter_factory = keystone.middleware.auth_token:filter_factory
+paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
diff --git a/tools/pip-requires b/tools/pip-requires
index 549f6e57f3..dca3667c95 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -33,3 +33,4 @@ Paste
 
 passlib
 jsonschema
+python-keystoneclient>=0.2.0
diff --git a/tools/test-requires b/tools/test-requires
index 0a89113817..e508ac3cf0 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -18,6 +18,3 @@ requests
 # Optional packages that should be installed when testing
 xattr>=0.6.0
 pysendfile==2.0.0
-
-# Needed for swift store functional tests
-python-keystoneclient