diff --git a/requirements.txt b/requirements.txt
index a58de8937d..5c2346005d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ passlib
 python-heatclient>=0.2.3
 python-novaclient>=2.17.0
 python-cinderclient>=1.0.6
-python-keystoneclient>=0.7.0
+python-keystoneclient>=0.8.0
 python-swiftclient>=1.6
 python-designateclient>=1.0.0
 iso8601>=0.1.9
diff --git a/setup.py b/setup.py
index 70c2b3f32b..736375744d 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,14 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
+
 setuptools.setup(
     setup_requires=['pbr'],
     pbr=True)