diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 9cf9dc6a73b..c16f9eefa0b 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -106,6 +106,11 @@
     vars:
       devstack_localrc:
         Q_AGENT: linuxbridge
+      devstack_local_conf:
+        post-config:
+          "/$NEUTRON_CORE_PLUGIN_CONF":
+            experimental:
+              linuxbridge: true
     irrelevant-files:
       - ^test-requirements.txt$
       - ^.*\.conf\.sample$
@@ -139,12 +144,6 @@
       - ^playbooks/.*functional.*$
       - ^zuul.d/(?!(project)).*\.yaml
 
-# TODO(ralonsoh): remove this duplicated definition when "devstack" and "nova"
-# adopt the new name.
-- job:
-    name: neutron-tempest-linuxbridge
-    parent: neutron-linuxbridge-tempest
-
 - job:
     name: neutron-ovs-tempest-iptables_hybrid
     parent: neutron-ovs-tempest-base