diff --git a/requirements.txt b/requirements.txt
index c6fafd42..24856f84 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,8 @@
-cliff>=1.10.0  # Apache-2.0
-pbr>=0.6,!=0.7,<1.0
-python-keystoneclient>=1.3.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.
+cliff>=1.13.0 # Apache-2.0
+pbr<2.0,>=0.11
+python-keystoneclient>=1.6.0
 PyYAML>=3.1.0
 requests>=2.5.2
diff --git a/setup.py b/setup.py
index 73637574..056c16c2 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");
diff --git a/test-requirements.txt b/test-requirements.txt
index 44083f9b..45e1c647 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,11 @@
-hacking>=0.9.2,<0.10
-pylint==1.4.1  # GNU GPL v2
+# 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.11,>=0.10
+pylint==1.4.1 # GNU GPL v2
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 unittest2
 fixtures>=0.3.14
 mock>=1.0
 nose
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0