diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent
index ee719c1a8f6..85417803627 100644
--- a/devstack/lib/ovn_agent
+++ b/devstack/lib/ovn_agent
@@ -34,7 +34,7 @@ OVN_BRANCH=${OVN_BRANCH:-master}
 # Set variables for building OVS from source
 OVS_REPO=${OVS_REPO:-https://github.com/openvswitch/ovs.git}
 OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.')
-OVS_BRANCH=$OVN_BRANCH
+OVS_BRANCH=${OVS_BRANCH:-master}
 
 # How to connect to ovsdb-server hosting the OVN SB database.
 OVN_SB_REMOTE=${OVN_SB_REMOTE:-tcp:$SERVICE_HOST:6642}
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 19ad27723e2..91b7601e12c 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -286,6 +286,7 @@
     vars:
       devstack_localrc:
         OVN_BRANCH: branch-2.12
+        OVS_BRANCH: branch-2.12
 
 - job:
     name: neutron-ovn-tempest-ovs-release
@@ -294,6 +295,7 @@
     vars:
       devstack_localrc:
         OVN_BRANCH: branch-2.12
+        OVS_BRANCH: branch-2.12
 
 - job:
     name: neutron-ovn-tempest-ovs-master-fedora