diff --git a/tox.ini b/tox.ini
index b74caf5f2d..292dbc2078 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,9 +5,7 @@ envlist = py34,py27,pep8
 
 [testenv]
 usedevelop = True
-install_command =
-                  constraints: pip install -U --force-reinstall -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-                  pip install -U {opts} {packages}
+install_command = pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
          LANGUAGE=en_US
@@ -37,6 +35,12 @@ commands =
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}
          LANGUAGE=en_US
+# NOTE(amrith) The setting of the install_command in this location
+# is only required because currently infra does not actually
+# support constraints files for the cover job, and while
+# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
+# no file there. It can be removed when infra changes this.
+install_command = pip install -U {opts} {packages}
 commands =
   python setup.py testr --coverage {posargs}
 
@@ -61,10 +65,22 @@ commands =
   python setup.py build_sphinx
 
 [testenv:releasenotes]
+# NOTE(amrith) The setting of the install_command in this location
+# is only required because currently infra does not actually
+# support constraints files for the releasenotes job, and while
+# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
+# no file there. It can be removed when infra changes this.
+install_command = pip install -U {opts} {packages}
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:venv]
 setenv = PYTHONHASHSEED=0
+# NOTE(amrith) The setting of the install_command in this location
+# is only required because currently infra does not actually
+# support constraints files for the docs job, and while
+# the environment variable UPPER_CONSTRAINTS_FILE is set, there's
+# no file there. It can be removed when infra changes this.
+install_command = pip install -U {opts} {packages}
 commands = {posargs}
 
 [flake8]