diff --git a/requirements.txt b/requirements.txt
index 8ce956a..c1dfbdf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,5 +7,5 @@ PyYAML>=3.1.0 # MIT
 yaql>=1.1.0 # Apache 2.0 License
 six>=1.9.0 # MIT
 stevedore>=1.16.0 # Apache-2.0
-semantic_version>=2.3.1 # BSD
-oslo.i18n>=2.1.0 # Apache-2.0
\ No newline at end of file
+semantic-version>=2.3.1 # BSD
+oslo.i18n>=2.1.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 056c16c..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index a3fcd81..3db356e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,8 +6,8 @@ hacking<0.12,>=0.11.0 # Apache-2.0
 
 coverage>=3.6 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
-oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD