diff --git a/cinderclient/exceptions.py b/cinderclient/exceptions.py
index 0c52c9c..55c0757 100644
--- a/cinderclient/exceptions.py
+++ b/cinderclient/exceptions.py
@@ -1,4 +1,18 @@
 # Copyright 2010 Jacob Kaplan-Moss
+#
+# 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.
+
 """
 Exception definitions.
 """
diff --git a/cinderclient/tests/fakes.py b/cinderclient/tests/fakes.py
index a6872bc..29260e1 100644
--- a/cinderclient/tests/fakes.py
+++ b/cinderclient/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.
+
 """
 A fake server that "responds" to API methods with pre-canned responses.
 
diff --git a/cinderclient/tests/test_base.py b/cinderclient/tests/test_base.py
index 75c37e6..508c03f 100644
--- a/cinderclient/tests/test_base.py
+++ b/cinderclient/tests/test_base.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.
+
 from cinderclient import base
 from cinderclient import exceptions
 from cinderclient.v1 import volumes
diff --git a/cinderclient/tests/test_client.py b/cinderclient/tests/test_client.py
index 17b2b88..47c4c69 100644
--- a/cinderclient/tests/test_client.py
+++ b/cinderclient/tests/test_client.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 cinderclient.client
 import cinderclient.v1.client
diff --git a/cinderclient/tests/test_http.py b/cinderclient/tests/test_http.py
index 3b93a4b..f38c6f1 100644
--- a/cinderclient/tests/test_http.py
+++ b/cinderclient/tests/test_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 mock
 
 import requests
diff --git a/cinderclient/tests/test_service_catalog.py b/cinderclient/tests/test_service_catalog.py
index c9d9819..1025bd5 100644
--- a/cinderclient/tests/test_service_catalog.py
+++ b/cinderclient/tests/test_service_catalog.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.
+
 from cinderclient import exceptions
 from cinderclient import service_catalog
 from cinderclient.tests import utils
diff --git a/cinderclient/tests/test_shell.py b/cinderclient/tests/test_shell.py
index d6ef425..9692847 100644
--- a/cinderclient/tests/test_shell.py
+++ b/cinderclient/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 re
 import sys
 
diff --git a/cinderclient/tests/test_utils.py b/cinderclient/tests/test_utils.py
index 8df482d..32db04c 100644
--- a/cinderclient/tests/test_utils.py
+++ b/cinderclient/tests/test_utils.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 collections
 import sys
 
diff --git a/cinderclient/tests/utils.py b/cinderclient/tests/utils.py
index 0ab8737..0deb579 100644
--- a/cinderclient/tests/utils.py
+++ b/cinderclient/tests/utils.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 os
 
 import fixtures
diff --git a/cinderclient/tests/v1/contrib/test_list_extensions.py b/cinderclient/tests/v1/contrib/test_list_extensions.py
index 8066c54..96f5e35 100644
--- a/cinderclient/tests/v1/contrib/test_list_extensions.py
+++ b/cinderclient/tests/v1/contrib/test_list_extensions.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.
+
 from cinderclient import extension
 from cinderclient.v1.contrib import list_extensions
 
diff --git a/cinderclient/tests/v1/test_auth.py b/cinderclient/tests/v1/test_auth.py
index 704eacc..b681dc7 100644
--- a/cinderclient/tests/v1/test_auth.py
+++ b/cinderclient/tests/v1/test_auth.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
 import mock
 
diff --git a/cinderclient/tests/v1/test_types.py b/cinderclient/tests/v1/test_types.py
index 6d7dd28..6212336 100644
--- a/cinderclient/tests/v1/test_types.py
+++ b/cinderclient/tests/v1/test_types.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.
+
 from cinderclient.v1 import volume_types
 from cinderclient.tests import utils
 from cinderclient.tests.v1 import fakes
diff --git a/cinderclient/tests/v1/test_volumes.py b/cinderclient/tests/v1/test_volumes.py
index 768e942..0da88e2 100644
--- a/cinderclient/tests/v1/test_volumes.py
+++ b/cinderclient/tests/v1/test_volumes.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.
+
 from cinderclient.tests import utils
 from cinderclient.tests.v1 import fakes
 
diff --git a/cinderclient/v1/limits.py b/cinderclient/v1/limits.py
index f76cd68..32421e8 100644
--- a/cinderclient/v1/limits.py
+++ b/cinderclient/v1/limits.py
@@ -1,4 +1,17 @@
-# Copyright 2011 OpenStack LLC.
+# Copyright 2011 OpenStack Foundation
+#
+# 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.
 
 from cinderclient import base
 
diff --git a/cinderclient/v2/limits.py b/cinderclient/v2/limits.py
index 87349b6..16eb515 100644
--- a/cinderclient/v2/limits.py
+++ b/cinderclient/v2/limits.py
@@ -1,4 +1,17 @@
-# Copyright 2013 OpenStack LLC.
+# Copyright 2013 OpenStack Foundation
+#
+# 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.
 
 from cinderclient import base
 
diff --git a/requirements.txt b/requirements.txt
index ab80cff..068a2f9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
-d2to1>=0.2.10,<0.3
 pbr>=0.5.16,<0.6
 argparse
-prettytable>=0.6,<0.8
+PrettyTable>=0.6,<0.8
 requests>=1.1,<1.2.3
 simplejson>=2.0.9
 six
diff --git a/setup.py b/setup.py
index 1e9882d..15f4e9d 100644
--- 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,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr>=0.5.20'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index ff2d884..30c33c0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 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
@@ -10,4 +10,4 @@ mock>=0.8.0
 python-subunit
 sphinx>=1.1.2
 testtools>=0.9.32
-testrepository>=0.0.15
+testrepository>=0.0.17