diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 66e35a348..956235572 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -147,6 +147,7 @@ class tripleo::profile::base::neutron::server (
   if $step >= 4 and $sync_db or $step >= 5 and !$sync_db {
 
     include neutron::server::notifications
+    include neutron::server::notifications::nova
     include neutron::server::placement
     # We need to override the hiera value neutron::server::sync_db which is set
     # to true
diff --git a/spec/classes/tripleo_profile_base_neutron_server_spec.rb b/spec/classes/tripleo_profile_base_neutron_server_spec.rb
index 3d09b4b6d..5a880781e 100644
--- a/spec/classes/tripleo_profile_base_neutron_server_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_server_spec.rb
@@ -43,6 +43,7 @@ eos
         is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
         is_expected.to_not contain_class('tripleo::profile::base::apache')
         is_expected.to_not contain_class('neutron::server::notifications')
+        is_expected.to_not contain_class('neutron::server::notifications::nova')
         is_expected.to_not contain_class('neutron::server::placement')
         is_expected.to_not contain_class('neutron::server')
         is_expected.to_not contain_class('neutron::db')
@@ -61,6 +62,7 @@ eos
         is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
         is_expected.to contain_class('tripleo::profile::base::apache')
         is_expected.to_not contain_class('neutron::server::notifications')
+        is_expected.to_not contain_class('neutron::server::notifications::nova')
         is_expected.to_not contain_class('neutron::server::placement')
         is_expected.to_not contain_class('neutron::server')
         is_expected.to_not contain_class('neutron::db')
@@ -79,6 +81,7 @@ eos
         is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
         is_expected.to_not contain_class('tripleo::profile::base::apache')
         is_expected.to_not contain_class('neutron::server::notifications')
+        is_expected.to_not contain_class('neutron::server::notifications::nova')
         is_expected.to_not contain_class('neutron::server::placement')
         is_expected.to_not contain_class('neutron::server')
         is_expected.to_not contain_class('neutron::db')
@@ -97,6 +100,7 @@ eos
         is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
         is_expected.to contain_class('tripleo::profile::base::apache')
         is_expected.to contain_class('neutron::server::notifications')
+        is_expected.to contain_class('neutron::server::notifications::nova')
         is_expected.to contain_class('neutron::server::placement')
         is_expected.to contain_class('neutron::server').with(
           :sync_db => true,
@@ -118,6 +122,7 @@ eos
         is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
         is_expected.to contain_class('tripleo::profile::base::apache')
         is_expected.to_not contain_class('neutron::server::notifications')
+        is_expected.to_not contain_class('neutron::server::notifications::nova')
         is_expected.to_not contain_class('neutron::server::placement')
         is_expected.to_not contain_class('neutron::server')
         is_expected.to_not contain_class('neutron::db')
@@ -136,6 +141,7 @@ eos
         is_expected.to contain_class('tripleo::profile::base::neutron::authtoken')
         is_expected.to contain_class('tripleo::profile::base::apache')
         is_expected.to contain_class('neutron::server::notifications')
+        is_expected.to contain_class('neutron::server::notifications::nova')
         is_expected.to contain_class('neutron::server::placement')
         is_expected.to contain_class('neutron::server').with(
           :sync_db => false,
diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml
index e533c7319..36f1d045f 100644
--- a/spec/fixtures/hieradata/default.yaml
+++ b/spec/fixtures/hieradata/default.yaml
@@ -113,7 +113,7 @@ horizon_node_names:
 #Neutron related
 neutron::rabbit_password: 'password'
 neutron::keystone::authtoken::password: 'password'
-neutron::server::notifications::password: 'password'
+neutron::server::notifications::nova::password: 'password'
 neutron::server::placement::password: 'password'
 # oslo.messaging related
 oslo_messaging_rpc_password: 'password'