diff --git a/requirements.txt b/requirements.txt
index 853a692577..888bf498f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,6 @@ gitdb>=0.6.4 # BSD License (3 clause)
 GitPython>=1.0.1 # BSD License (3 clause)
 six>=1.9.0 # MIT
 oslo.config>=3.14.0 # Apache-2.0
-graphviz>=0.4.0 # MIT License
+graphviz!=0.5.0,>=0.4.0 # MIT License
 setuptools!=24.0.0,>=16.0 # PSF/ZPL
 pycrypto>=2.6 # Public Domain
diff --git a/test-requirements.txt b/test-requirements.txt
index 54be295daa..a25624150c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,14 +3,14 @@
 # process, which may cause wedges in the gate later.
 bandit>=1.1.0 # Apache-2.0
 bashate>=0.2 # Apache-2.0
-beautifulsoup4  # MIT
+beautifulsoup4 # MIT
 doc8 # Apache-2.0
 hacking>=0.10.0
 oslo.log>=1.14.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 reno>=1.8.0 # Apache2
-PrettyTable>=0.7,<0.8  # BSD
+PrettyTable<0.8,>=0.7 # BSD
 PyYAML>=3.1.0 # MIT
 python-barbicanclient>=4.0.0 # Apache-2.0
 python-ceilometerclient>=2.5.0 # Apache-2.0