diff --git a/neutron/plugins/ml2/drivers/linuxbridge/mech_driver/mech_linuxbridge.py b/neutron/plugins/ml2/drivers/linuxbridge/mech_driver/mech_linuxbridge.py
index ab46565122b..49f544bc4d3 100644
--- a/neutron/plugins/ml2/drivers/linuxbridge/mech_driver/mech_linuxbridge.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/mech_driver/mech_linuxbridge.py
@@ -36,7 +36,7 @@ class LinuxbridgeMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
         sg_enabled = securitygroups_rpc.is_firewall_enabled()
         super(LinuxbridgeMechanismDriver, self).__init__(
             constants.AGENT_TYPE_LINUXBRIDGE,
-            'tap',  # const merge in I718f514e1673544114063af5e1a14ec29bf3274d
+            portbindings.VIF_TYPE_TAP,
             {portbindings.CAP_PORT_FILTER: sg_enabled})
         lb_qos_driver.register()
 
diff --git a/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/test_mech_linuxbridge.py b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/test_mech_linuxbridge.py
index 99cc401fcd4..466a39e6b72 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/test_mech_linuxbridge.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/test_mech_linuxbridge.py
@@ -24,7 +24,7 @@ from neutron.tests.unit.plugins.ml2 import _test_mech_agent as base
 
 
 class LinuxbridgeMechanismBaseTestCase(base.AgentMechanismBaseTestCase):
-    VIF_TYPE = 'tap'
+    VIF_TYPE = portbindings.VIF_TYPE_TAP
     CAP_PORT_FILTER = True
     AGENT_TYPE = constants.AGENT_TYPE_LINUXBRIDGE