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