diff --git a/setup.cfg b/setup.cfg
index ade9f5df..b6537164 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,6 +9,3 @@ classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[wheel]
-universal = 1
diff --git a/test-requirements.txt b/test-requirements.txt
index d5d4ce60..776c5279 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,2 @@
-pbr>=0.6,!=0.7,<1.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
 bashate >= 0.2
diff --git a/tox.ini b/tox.ini
index f268a7d7..484e7034 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,15 +4,14 @@ minversion = 1.6
 skipsdist = True
 
 [testenv]
-install_command = pip install -U {opts} {packages}
+basepython = python3
 setenv = VIRTUAL_ENV={envdir}
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
 passenv = GENERATE_GRENADE_PLUGIN_LIST
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:bashate]
@@ -20,10 +19,9 @@ commands =
   bash -c "ls *.sh prep-* stop-* upgrade-* from-*/upgrade-* functions | xargs bashate -v {posargs}"
 
 [testenv:docs]
-basepython = python3
 whitelist_externals = bash
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
 setenv =
   TOP_DIR={toxinidir}