diff --git a/heatclient/tests/fakes.py b/heatclient/tests/fakes.py
index 657ad800..732bd1f8 100644
--- a/heatclient/tests/fakes.py
+++ b/heatclient/tests/fakes.py
@@ -1,3 +1,16 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import json
 
 from heatclient import exc
diff --git a/heatclient/tests/test_common_http.py b/heatclient/tests/test_common_http.py
index 6b106c7e..cd5a9510 100644
--- a/heatclient/tests/test_common_http.py
+++ b/heatclient/tests/test_common_http.py
@@ -1,3 +1,16 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import mox
 import testtools
 
diff --git a/heatclient/tests/test_shell.py b/heatclient/tests/test_shell.py
index af3c69de..9a07e0c5 100644
--- a/heatclient/tests/test_shell.py
+++ b/heatclient/tests/test_shell.py
@@ -1,3 +1,16 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import cStringIO
 import httplib2
 import os
diff --git a/requirements.txt b/requirements.txt
index 75ea491e..4abbae6d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,7 @@
-d2to1>=0.2.10,<0.3
 pbr>=0.5.16,<0.6
 argparse
 httplib2
 iso8601>=0.1.4
-prettytable>=0.6,<0.8
-python-keystoneclient>=0.2.1
-pyyaml>=3.1.0
+PrettyTable>=0.6,<0.8
+python-keystoneclient>=0.3.0
+PyYAML>=3.1.0
diff --git a/setup.py b/setup.py
index b3e85a71..15f4e9d5 100755
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr>=0.5.20'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 6d731a4e..70bc3bf6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,12 +2,12 @@
 pep8==1.4.5
 pyflakes==0.7.2
 flake8==2.0
-hacking>=0.5.6,<0.6
+hacking>=0.5.6,<0.7
 coverage>=3.6
 discover
 fixtures>=0.3.12
 mox>=0.5.3
 sphinx>=1.1.2
-testscenarios<0.5
-testrepository>=0.0.15
+testscenarios>=0.4,<0.5
+testrepository>=0.0.17
 testtools>=0.9.32
diff --git a/tox.ini b/tox.ini
index 79af2fbd..740724ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,6 +22,6 @@ downloadcache = ~/cache/pip
 
 [flake8]
 show-source = True
-ignore = H302
+ignore = H233,H302,H501
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build