diff --git a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config
index cce3052ee..3ce92db84 100755
--- a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config
+++ b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config
@@ -17,7 +17,7 @@ else
     # envvars
     $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
     # bug #1293812 : Avoid easy_install triggering on pbr.
-    $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
+    $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11'
     $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U os-apply-config
 fi
 
diff --git a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
index 53a71faca..c849408a5 100755
--- a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
+++ b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
@@ -15,7 +15,7 @@ else
     # downloading from pypi using http_proxy and https_proxy
     $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
     # bug #1293812 : Avoid easy_install triggering on pbr.
-    $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
+    $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11'
     $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U os-collect-config
 fi
 
diff --git a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source
index b071e639f..d438df713 100755
--- a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source
+++ b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source
@@ -17,7 +17,7 @@ else
     # envvars
     $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
     # bug #1293812 : Avoid easy_install triggering on pbr.
-    $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
+    $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11'
     $OS_NET_CONFIG_VENV_DIR/bin/pip install -U os-net-config
 fi
 
diff --git a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config
index 26139155d..52d7f88b8 100755
--- a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config
+++ b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config
@@ -21,7 +21,7 @@ else
     /opt/stack/venvs/os-refresh-config/bin/pip install -U pip
     /opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0'
     # bug #1293812 : Avoid easy_install triggering on pbr.
-    /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.11,<2.0'
+    /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.11'
     /opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config
 fi
 
diff --git a/elements/os-svc-install/bin/os-svc-install b/elements/os-svc-install/bin/os-svc-install
index bb90012f2..6f30f2a9e 100755
--- a/elements/os-svc-install/bin/os-svc-install
+++ b/elements/os-svc-install/bin/os-svc-install
@@ -38,7 +38,7 @@ function python_install() {
         pip install -U 'setuptools>=1.0'
 
         # bug #1293812 : Avoid easy_install triggering on pbr.
-        pip install -U 'pbr>=0.11,<2.0'
+        pip install -U 'pbr>=0.11'
 
         if [ -n "$reqs" ] ; then
             # Install requirements off source repo if the install type
diff --git a/requirements.txt b/requirements.txt
index 322a9266b..37516e41e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-pbr>=0.11,<2.0
+pbr>=0.11
diff --git a/test-requirements.txt b/test-requirements.txt
index 3687e2d8a..31f422cba 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
-hacking>=1.1.0,<1.2.0 # Apache-2.0
+hacking>=2.0.0 # Apache-2.0
 openstackdocstheme>=1.11.0  # Apache-2.0
 
 oslotest
diff --git a/tests/test_no_dup_filenames.py b/tests/test_no_dup_filenames.py
index f9320cdaf..ec4a6f09a 100644
--- a/tests/test_no_dup_filenames.py
+++ b/tests/test_no_dup_filenames.py
@@ -37,5 +37,5 @@ class TestNoDupFilenames(testtools.TestCase):
                     short_path = target[len(element_dir) + 1:]
                     if not os.path.isdir(target):
                         err_msg = 'Duplicate file name found %s' % short_path
-                        self.assertFalse(short_path in filenames, err_msg)
+                        self.assertNotIn(short_path, filenames, err_msg)
                         filenames.append(short_path)