diff --git a/lower-constraints.txt b/lower-constraints.txt
index e55e4db1d..bf0c49bf0 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -46,7 +46,7 @@ jmespath==0.9.3
 jsonpointer==2.0
 jsonschema==2.6.0
 keystoneauth1==3.4.0
-keystonemiddleware==4.17.0
+keystonemiddleware==4.18.0
 kombu==4.1.0
 linecache2==1.0.0
 logutils==0.3.5
diff --git a/requirements.txt b/requirements.txt
index 8c74bc66e..67c572984 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
 
 PyYAML>=3.12 # MIT
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
-keystonemiddleware>=4.17.0 # Apache-2.0
+keystonemiddleware>=4.18.0 # Apache-2.0
 pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
 psutil>=3.2.2 # BSD
 python-etcd>=0.4.3 # MIT License
diff --git a/tox.ini b/tox.ini
index 474fcccc9..da2a4f87c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ 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}
+install_command = pip install {opts} {packages}
 whitelist_externals = bash
                       find
                       rm
@@ -13,7 +13,8 @@ setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
 
-deps = -r{toxinidir}/requirements.txt
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
 commands =