diff --git a/.zuul.yaml b/.zuul.yaml
index e46eac85f5a..141a37f4cf3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -744,7 +744,7 @@
             irrelevant-files: *nova-base-irrelevant-files
         - neutron-ovs-tempest-iptables_hybrid:
             irrelevant-files: *nova-base-irrelevant-files
-        - os-vif-ovs:
+        - os-vif-ovn:
             irrelevant-files: *nova-base-irrelevant-files
         - devstack-plugin-ceph-compute-local-ephemeral:
             irrelevant-files: *nova-base-irrelevant-files
diff --git a/tox.ini b/tox.ini
index 0f798c2fde4..1df42f3631f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,12 @@ envlist = py39,functional,pep8
 # env and ignore basepython inherited from [testenv] if we set
 # ignore_basepython_conflict.
 ignore_basepython_conflict = True
+# NOTE(elod.illes): latest virtualenv bundles setuptools 82.0.0, which
+# dropped pkg_resources module source from the package, which is used
+# in nova and other packages, thus virtualenv needs to be pinned to fix
+# the gate.
+requires =
+    virtualenv<20.37.0
 
 [testenv]
 basepython = python3