diff --git a/requirements.txt b/requirements.txt
index 1e31be08..24338d1b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5.10,<0.6
+pbr>=0.5.21,<1.0
 
-django>=1.4
+Django>=1.4,<1.6
 django-openid-auth
 markdown
 python-openid
diff --git a/setup.cfg b/setup.cfg
index 2b05bec8..7c965579 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,10 +21,6 @@ classifier =
     Programming Language :: Python :: 2.6
     Topic :: Internet :: WWW/HTTP
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [files]
 packages =
     storyboard
diff --git a/setup.py b/setup.py
index b3e85a71..70c2b3f3 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'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 581beeaa..16c1297d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,8 @@
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.8
 
-coverage
+coverage>=3.6
 discover
-fixtures>=0.3.12
-testrepository>=0.0.13
-testtools>=0.9.26
+python-subunit
+fixtures>=0.3.14
+testrepository>=0.0.17
+testtools>=0.9.32