diff --git a/lower-constraints.txt b/lower-constraints.txt
index 98953c9..2c71468 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -26,7 +26,6 @@ linecache2==1.0.0
 logilab-common==1.4.1
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
 netaddr==0.7.19
 oslo.config==5.2.0
 oslo.i18n==3.20.0
@@ -56,6 +55,5 @@ termcolor==1.1.0
 testrepository==0.0.18
 testtools==2.2.0
 traceback2==1.4.0
-unittest2==1.1.0
 urllib3==1.22
 wrapt==1.10.11
diff --git a/test-requirements.txt b/test-requirements.txt
index 357561e..cec434c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,11 +5,9 @@
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
-mock>=2.0.0 # BSD
 oslo.config>=5.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-unittest2>=1.1.0 # BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2  # BSD
 astroid==2.1.0 # LGPLv2.1
 pylint==2.3.1 # GPLv2
diff --git a/tox.ini b/tox.ini
index 7cda564..d8409a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_RED=0.05
          NOSE_OPENSTACK_YELLOW=0.025
          NOSE_OPENSTACK_SHOW_ELAPSED=1
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =