diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp
index 8b97903bd..4dc0b6d59 100644
--- a/manifests/agents/ml2/ovs.pp
+++ b/manifests/agents/ml2/ovs.pp
@@ -166,16 +166,7 @@ class neutron::agents::ml2::ovs (
     neutron_agent_ovs { 'securitygroup/firewall_driver': ensure => absent }
   }
 
-  vs_bridge { $integration_bridge:
-    ensure => present,
-    before => Service['neutron-ovs-agent-service'],
-  }
-
   if $enable_tunneling {
-    vs_bridge { $tunnel_bridge:
-      ensure => present,
-      before => Service['neutron-ovs-agent-service'],
-    }
     neutron_agent_ovs {
       'ovs/enable_tunneling': value => true;
       'ovs/tunnel_bridge':    value => $tunnel_bridge;
diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb
index cb0ccfede..48c34b567 100644
--- a/spec/classes/neutron_agents_ml2_ovs_spec.rb
+++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb
@@ -51,14 +51,6 @@ describe 'neutron::agents::ml2::ovs' do
       is_expected.to contain_neutron_agent_ovs('ovs/local_ip').with_ensure('absent')
     end
 
-    it 'configures vs_bridge' do
-      is_expected.to contain_vs_bridge(p[:integration_bridge]).with(
-        :ensure  => 'present',
-        :before => 'Service[neutron-ovs-agent-service]'
-      )
-      is_expected.not_to contain_vs_brige(p[:integration_bridge])
-    end
-
     it 'installs neutron ovs agent package' do
       if platform_params.has_key?(:ovs_agent_package)
         is_expected.to contain_package('neutron-ovs-agent').with(
@@ -155,10 +147,6 @@ describe 'neutron::agents::ml2::ovs' do
           is_expected.to contain_neutron_agent_ovs('ovs/enable_tunneling').with_value(true)
           is_expected.to contain_neutron_agent_ovs('ovs/tunnel_bridge').with_value(default_params[:tunnel_bridge])
           is_expected.to contain_neutron_agent_ovs('ovs/local_ip').with_value('127.0.0.1')
-          is_expected.to contain_vs_bridge(default_params[:tunnel_bridge]).with(
-            :ensure  => 'present',
-            :before => 'Service[neutron-ovs-agent-service]'
-          )
         end
       end