diff --git a/lower-constraints.txt b/lower-constraints.txt
index b0c82690c4..273632a6ae 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -57,6 +57,7 @@ os-client-config==2.1.0
 os-service-types==1.7.0
 os-traits==0.4.0
 osc-lib==2.0.0
+oslo.cache==2.5.0
 oslo.concurrency==4.2.0
 oslo.config==5.2.0
 oslo.context==2.19.2
diff --git a/test-requirements.txt b/test-requirements.txt
index 90f58677e8..72cd8e6b9d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,10 +1,9 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking>=3.1.0,<4.0.0 # Apache-2.0
+
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
-doc8>=0.6.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 PyMySQL>=0.8.0 # MIT License
 iso8601>=0.1.11 # MIT
@@ -14,9 +13,5 @@ stestr>=1.0.0 # Apache-2.0
 psycopg2>=2.8.5 # LGPL/ZPL
 testtools>=2.2.0 # MIT
 WebTest>=2.0.27 # MIT
-bashate>=0.5.1 # Apache-2.0
-pycodestyle>=2.0.0,<2.7.0 # MIT
 pysnmp>=4.4.12
-flake8-import-order>=0.17.1 # LGPLv3
-Pygments>=2.2.0 # BSD
-bandit!=1.6.0,>=1.1.0,<2.0.0 # Apache-2.0
+bandit!=1.6.0,>=1.1.0,<2.0.0 # Apache-2.0
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 62c089e8c2..2ad7bcff72 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ ignore_basepython_conflict=true
 
 [testenv]
 usedevelop = True
-basepython = python3
+basepython = python3.8
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
          LANGUAGE=en_US
@@ -31,6 +31,13 @@ deps = {[testenv]deps}
 commands = {toxinidir}/tools/states_to_dot.py -f {toxinidir}/doc/source/images/states.svg --format svg
 
 [testenv:pep8]
+deps=
+    hacking>=3.1.0,<4.0.0 # Apache-2.0
+    doc8>=0.6.0 # Apache-2.0
+    pycodestyle>=2.0.0,<2.7.0 # MIT
+    flake8-import-order>=0.17.1 # LGPLv3
+    Pygments>=2.2.0 # BSD
+    bashate>=0.5.1 # Apache-2.0
 whitelist_externals = bash
 commands =
   bash tools/flake8wrap.sh {posargs}
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 7b3ac2fe2f..1e72e3a6cf 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -19,7 +19,8 @@
         - ironic-tempest-wholedisk-bios-snmp-pxe
         - ironic-tempest-ipa-partition-pxe_ipmitool
         - ironic-tempest-ipa-partition-uefi-pxe_ipmitool
-        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
+            voting: false
         - ironic-tempest-bios-ipmi-direct-tinyipa
         - ironic-tempest-bfv
         - ironic-tempest-ipa-partition-uefi-pxe-grub2
@@ -56,7 +57,6 @@
         - ironic-tempest-wholedisk-bios-snmp-pxe
         - ironic-tempest-ipa-partition-pxe_ipmitool
         - ironic-tempest-ipa-partition-uefi-pxe_ipmitool
-        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
         - ironic-tempest-bios-ipmi-direct-tinyipa
         - ironic-tempest-bfv
         - ironic-tempest-ipa-partition-uefi-pxe-grub2