diff --git a/requirements.txt b/requirements.txt
index d35748f..e337026 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,10 @@
-oslosphinx
-sphinx>=1.1.2,<1.2
+# 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.
+
+pbr>=2.0.0  # Apache-2.0
+
+oslosphinx>=4.7.0 # Apache-2.0
+sphinx>=1.5.1 # BSD
+
 yasfb>=0.5.1
diff --git a/setup.cfg b/setup.cfg
index ef6cce9..1dccad4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,9 +15,7 @@ classifier =
 source-dir = doc/source
 build-dir = doc/build
 all_files = 1
-
-[pbr]
-warnerrors = True
+warning-is-error = 1
 
 [upload_sphinx]
 upload-dir = doc/build/html
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index 70c2b3f..782bb21
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,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'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/specs/gerrit-2.13.rst b/specs/gerrit-2.13.rst
index 7a8efe7..df42e2a 100644
--- a/specs/gerrit-2.13.rst
+++ b/specs/gerrit-2.13.rst
@@ -118,18 +118,19 @@ Testing
 
 We need to update review-dev.o.o with Gerrit 2.13 and test the
 following integrations:
- - data migration
- - gerrit replication
- - gerrit javascript (toggle-ci & test results)
- - jeepyb integration
- - zuul integration
- - storyboard integration (its-storyboard plugin)
- - launchpad integration
- - gerrty
- - rollback
- - javamelody plugin
- - gerrit hooks
- - git-review
+
+- data migration
+- gerrit replication
+- gerrit javascript (toggle-ci & test results)
+- jeepyb integration
+- zuul integration
+- storyboard integration (its-storyboard plugin)
+- launchpad integration
+- gerrty
+- rollback
+- javamelody plugin
+- gerrit hooks
+- git-review
 
 
 Dependencies
diff --git a/specs/server_base_template_refactor.rst b/specs/server_base_template_refactor.rst
index 68d4bff..f81aeb3 100644
--- a/specs/server_base_template_refactor.rst
+++ b/specs/server_base_template_refactor.rst
@@ -56,7 +56,7 @@ out of the application classes and put it in the node definition. Example:
         sysadmins                 => hiera('sysadmins', 'default'),
       }
       class {'openstack_project::review':
-        ... other params ..
+        # ... other params ..
       }
     }
 
diff --git a/test-requirements.txt b/test-requirements.txt
index e69de29..9dbc011 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -0,0 +1,3 @@
+# 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.