diff --git a/requirements.txt b/requirements.txt
index 857dda2..bf4e10e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.8 # Apache-2.0
+pbr>=2.0.0,!=2.1.0  # Apache-2.0
 
-cliff>=1.4
+cliff>=2.6.0  # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 4a7d204..20dda9f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,11 +2,11 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=0.12.0,<0.13 # Apache-2.0
+hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
 
-coverage>=4.0 # Apache-2.0
+coverage>=4.0,!=4.4  # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.2.1,!=1.3b1,<1.4 # BSD
+sphinx>=1.5.1,!=1.6.1  # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18  # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index c888992..0e33df3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,14 @@
 [tox]
 minversion = 2.0
-envlist = py34,py27,pypy,pep8
+envlist = py35,py27,pep8
 skipsdist = True
-
+ 
 [testenv]
-usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-setenv =
-   VIRTUAL_ENV={envdir}
-   PYTHONWARNINGS=default::DeprecationWarning
-deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+setenv = VIRTUAL_ENV={envdir}
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
+           testr run {posargs}
 
 [testenv:pep8]
 commands = flake8 {posargs}