diff --git a/requirements.txt b/requirements.txt
index c09cd7b7..b231b5fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,13 @@
-pbr>=0.6,!=0.7,<1.0
+# 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>=1.6
 argparse
-cliff>=1.4.3
+cliff>=1.14.0 # Apache-2.0
 iso8601>=0.1.9
-netaddr>=0.7.6
-requests>=1.1
-python-keystoneclient>=0.9.0
-simplejson>=2.0.9
-six>=1.6.0
+netaddr!=0.7.16,>=0.7.12
+requests!=2.8.0,>=2.5.2
+python-keystoneclient!=1.8.0,>=1.6.0
+simplejson>=2.2.0
+six>=1.9.0
 Babel>=1.3
diff --git a/setup.py b/setup.py
index 73637574..782bb21f 100644
--- 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");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 402590b9..c6642e82 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,11 +1,16 @@
-hacking>=0.8.0,<0.9
-
+# 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.
+hacking>=0.10.2,<0.11
 cliff-tablib>=1.0
 coverage>=3.6
 discover
-fixtures>=0.3.14
+fixtures>=1.3.1
 mox>=0.5.3
+flake8>=2.2.4,<=2.4.1
+pep8==1.5.7
+pyflakes==0.8.1
 python-subunit>=0.0.18
-sphinx>=1.1.2,<1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
-testtools>=0.9.34
+testtools>=1.4.0
diff --git a/tox.ini b/tox.ini
index b7a2a796..1ed65754 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,6 +30,12 @@ downloadcache = ~/cache/pip
 [flake8]
 # E125 continuation line does not distinguish itself from next logical line
 # H302 import only modules
-ignore = E125,H302
+# H105 Don't use author tags
+# H405 multi line docstring summary not separated with an empty line
+# E265 block comment should start with '# '
+# H238 old style class declaration, use new style (inherit from `object`)
+# E129 visually indented line with same indent as next logical line
+# E113 unexpected indentation
+ignore = E125,H302,H105,H405,E265,H238,E129,E113
 show-source = true
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools