diff --git a/.zuul.yaml b/.zuul.yaml
index ae70db78..4d49144b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,6 @@
 - job:
     name: castellan-functional-vault
-    parent: openstack-tox-py27
+    parent: openstack-tox-py36
     description: |
       Run tox functional-vault target
     required-projects:
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 97ac059a..cee625dd 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,6 +1,5 @@
 appdirs==1.3.0
 asn1crypto==0.23.0
-Babel==2.3.4
 certifi==2020.4.5.2
 cffi==1.13.2
 chardet==3.0.4
diff --git a/requirements.txt b/requirements.txt
index 5bec0f2b..369de27d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,6 @@
 # process, which may cause wedges in the gate later.
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-Babel!=2.4.0,>=2.3.4 # BSD
 cryptography>=2.1 # BSD/Apache-2.0
 python-barbicanclient>=4.5.2 # Apache-2.0
 oslo.config>=6.4.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 566d8443..cd35c3c3 100644
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
     pbr=True)
diff --git a/tox.ini b/tox.ini
index 2288a4ff..1458e595 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ setenv =
    VIRTUAL_ENV={envdir}
    OS_TEST_PATH=./castellan/tests/unit
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+       -c{env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
@@ -78,7 +78,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 
 [testenv:functional]
 usedevelop = True
-install_command = pip install -U {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
     OS_TEST_PATH=./castellan/tests/functional
@@ -87,7 +86,6 @@ commands = stestr run --slowest {posargs}
 [testenv:functional-vault]
 passenv = HOME
 usedevelop = True
-install_command = pip install -U {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
     OS_TEST_PATH=./castellan/tests/functional