diff --git a/requirements.txt b/requirements.txt
index 59d7976..b10172a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,15 +2,15 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6
+pbr>=2.0.0 # Apache-2.0
 
 ansible>=2.0
 appdirs>=1.3.0 # MIT License
-jsonschema>=2.0.0,!=2.5.0,<3.0.0 # MIT
-iso8601>=0.1.9
-oslo.i18n>=1.5.0 # Apache-2.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
+iso8601>=0.1.11 # MIT
+oslo.i18n>=2.1.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0
-pyghmi>=1.0.3 # Apache-2.0
-PyYAML>=3.1.0 # MIT
-six>=1.9.0
+oslo.utils>=3.20.0 # Apache-2.0
+pyghmi>=1.0.9 # Apache-2.0
+PyYAML>=3.10.0 # MIT
+six>=1.9.0 # MIT
diff --git a/setup.cfg b/setup.cfg
index 46a4ff3..92494e0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,7 +26,7 @@ console_scripts =
 
 [extras]
 libvirt =
-    libvirt-python>=1.2.5 # LGPLv2+
+  libvirt-python>=1.2.5 # LGPLv2+
 
 [build_sphinx]
 source-dir = doc/source
diff --git a/setup.py b/setup.py
index 056c16c..566d844 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index e6c497b..a8c3590 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,23 +2,23 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking<0.11,>=0.10.0
-pytest>=2.7,<=3.0.2 # MIT
-pytest-cov>=2.2.1,<=2.3.1 # MIT
-pytest-html>=1.10.0,<=1.10.0 # Mozilla Public License 2.0 (MPL 2.0)
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+pytest<=3.0.2,>=2.7 # MIT
+pytest-cov<=2.3.1,>=2.2.1 # MIT
+pytest-html<=1.10.0,>=1.10.0 # Mozilla Public License 2.0 (MPL 2.0)
 pytest-logging==2015.11.4 # Apache-2.0
 
-coverage>=3.6
-ddt>=1.0.1
-mock>=1.2
-python-subunit>=0.0.18
-sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
-sphinxcontrib-programoutput
+coverage>=4.0 # Apache-2.0
+ddt>=1.0.1 # MIT
+mock>=2.0 # BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx>=1.5.1 # BSD
+sphinxcontrib-programoutput # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 
 # releasenotes
-reno>=1.6.2 # Apache2
+reno>=1.8.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 9ec6566..fc1da5a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-minversion = 2.0
+minversion = 2.6
 envlist = pep8-constraints,py27-constraints,py35-constraints,cover
 skipsdist = True
 
@@ -14,10 +14,10 @@ whitelist_externals =
     find
     rm
 
-# TODO(astudenov): replace libvirt-python with extras option from tox 2.4
 deps =
     -r{toxinidir}/test-requirements.txt
-    libvirt-python>=1.2.5
+extras =
+    libvirt
 commands =
   find . -type f -name "*.pyc" -delete
   py.test -vvvv --html={envlogdir}/pytest_results.html --self-contained-html --durations=10 "os_faults/tests/unit" {posargs}