diff --git a/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp b/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
index 99ebf249d5..337a77689e 100644
--- a/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
+++ b/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp
@@ -142,7 +142,7 @@ class openstack_tasks::sahara::sahara {
 
     if $ceilometer_hash['enabled'] {
       class { '::sahara::notify':
-        enable_notifications => true,
+        notification_driver => $ceilometer_hash['notification_driver'],
       }
     }
 
diff --git a/tests/noop/spec/hosts/sahara/sahara_spec.rb b/tests/noop/spec/hosts/sahara/sahara_spec.rb
index 005cc83f15..bf386ad001 100644
--- a/tests/noop/spec/hosts/sahara/sahara_spec.rb
+++ b/tests/noop/spec/hosts/sahara/sahara_spec.rb
@@ -190,7 +190,7 @@ describe manifest do
       context 'with ceilometer', :if => enable do
         it 'should declare sahara::notify class correctly' do
           should contain_class('sahara::notify').with(
-                     'enable_notifications' => true
+                   'notification_driver' => Noop.hiera_structure('ceilometer/notification_driver')
                  )
         end
       end