diff --git a/ceilometer/tests/api.py b/ceilometer/tests/api.py
index 36b377e36..51a877c48 100644
--- a/ceilometer/tests/api.py
+++ b/ceilometer/tests/api.py
@@ -133,7 +133,7 @@ class FunctionalTest(db_test_base.TestBase):
         pecan.set_config({}, overwrite=True)
 
     def get_json(self, path, expect_errors=False, headers=None,
-                 q=[], **params):
+                 extra_environ=None, q=[], **params):
         full_path = self.PATH_PREFIX + path
         query_params = {'q.field': [],
                         'q.value': [],
@@ -150,6 +150,7 @@ class FunctionalTest(db_test_base.TestBase):
         response = self.app.get(full_path,
                                 params=all_params,
                                 headers=headers,
+                                extra_environ=extra_environ,
                                 expect_errors=expect_errors)
         if not expect_errors:
             response = response.json
diff --git a/tests/api/v2/test_acl.py b/tests/api/v2/test_acl.py
index 2bb7078c5..8cd650e2d 100644
--- a/tests/api/v2/test_acl.py
+++ b/tests/api/v2/test_acl.py
@@ -18,6 +18,10 @@
 """Test ACL."""
 
 import datetime
+from oslo.config import cfg
+
+from ceilometer.api import acl
+from ceilometer import policy
 
 from .base import FunctionalTest
 
@@ -54,9 +58,19 @@ class TestAPIACL(FunctionalTest):
 
     def setUp(self):
         super(TestAPIACL, self).setUp()
-        self.app.app._cache = FakeMemcache()
+        self.environ = {'fake.cache': FakeMemcache()}
+
+    def get_json(self, path, expect_errors=False, headers=None,
+                 q=[], **params):
+        return super(TestAPIACL, self).get_json(path,
+                                                expect_errors=expect_errors,
+                                                headers=headers,
+                                                q=q,
+                                                extra_environ=self.environ,
+                                                **params)
 
     def _make_app(self):
+        cfg.CONF.set_override("cache", "fake.cache", group=acl.OPT_GROUP_NAME)
         return super(TestAPIACL, self)._make_app(enable_acl=True)
 
     def test_non_authenticated(self):
diff --git a/tools/pip-requires b/tools/pip-requires
index ad2ee9a10..6b546edf4 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -14,10 +14,7 @@ pecan>=0.2.0
 stevedore>=0.7
 python-glanceclient
 python-novaclient>=2.6.10
-# FIXME(llu) Until the latest python-keystoneclient compatible with oslo.config
-# is ready on Pypi, we use master for work-around. Bug #1151665.
-# python-keystoneclient>=0.2,<0.3
-http://tarballs.openstack.org/python-keystoneclient/python-keystoneclient-master.tar.gz#egg=python-keystoneclient
+python-keystoneclient>=0.2.3
 python-swiftclient
 lxml
 requests<1.0