diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
index b848b9212..afbde79fe 100644
--- a/manifests/plugins/ml2.pp
+++ b/manifests/plugins/ml2.pp
@@ -99,7 +99,7 @@
 
   include neutron::params
 
-  Neutron_plugin_ml2<||> ~> Service['neutron-server']
+  Neutron_plugin_ml2<||> ~> Service <| title == 'neutron-server' |>
 
   # test mechanism drivers
   validate_array($mechanism_drivers)
diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb
index f30a82aa4..d1788ad4e 100644
--- a/spec/classes/neutron_plugins_ml2_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_spec.rb
@@ -25,10 +25,7 @@
   let :pre_condition do
     "class { 'neutron':
       rabbit_password => 'passw0rd',
-      core_plugin     => 'neutron.plugins.ml2.plugin.Ml2Plugin' }
-
-     class { 'neutron::server':
-      auth_password => 'test'}"
+      core_plugin     => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
   end
 
   let :default_params do