diff --git a/pylint.rc b/pylint.rc
index d20b7606a..a4c835e94 100755
--- a/pylint.rc
+++ b/pylint.rc
@@ -48,8 +48,8 @@ load-plugins=
 # W0703 broad except warning
 # W1201 logging-not-lazy
 # W1401 anomalous-backslash-in-string
-disable=C, R, E0203, E0602, E1101, E1205, fixme,
-        W0102, W0105, W0106, W0201, W0212, W0221, W0231, W0235,
+disable=C, R, E0203, E0602, E1101, E1205, E1135, fixme,
+        W0102, W0105, W0106, W0201, W0212, W0221, W0231, W0235, W0107,
         W0611, W0612, W0613, W0621, W0622, W0702, W0703, W1201, W1401
 
 
diff --git a/tox.ini b/tox.ini
index 87600d3e2..da30196ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,9 @@ skipsdist = True
 stxdir = {toxinidir}/..
 
 [testenv]
-install_command = pip install -U {opts} {packages}
+install_command = pip install -U \
+  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
+  {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_CAPTURE=1
          OS_STDERR_CAPTURE=1
@@ -78,7 +80,7 @@ commands =
     flake8
 
 [testenv:pylint]
-basepython = python2.7
+basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
        -e{[tox]stxdir}/update/tsconfig/tsconfig
        -e{[tox]stxdir}/fault/fm-api