diff --git a/manifests/init.pp b/manifests/init.pp
index 19cf69b..14e594d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -87,8 +87,8 @@ class zaqar(
   $subscription_pipeline  = $facts['os_service_default'],
   $topic_pipeline         = $facts['os_service_default'],
   $max_messages_post_size = $facts['os_service_default'],
-  $message_store          = 'mongodb',
-  $management_store       = 'mongodb',
+  $message_store          = $facts['os_service_default'],
+  $management_store       = $facts['os_service_default'],
   $package_name           = $::zaqar::params::package_name,
   $package_ensure         = 'present',
   Boolean $purge_config   = false,
diff --git a/spec/classes/zaqar_init_spec.rb b/spec/classes/zaqar_init_spec.rb
index 493d1c2..8dd978f 100644
--- a/spec/classes/zaqar_init_spec.rb
+++ b/spec/classes/zaqar_init_spec.rb
@@ -39,6 +39,8 @@ describe 'zaqar' do
         is_expected.to contain_zaqar_config('storage/claim_pipeline').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_zaqar_config('storage/subscription_pipeline').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_zaqar_config('storage/topic_pipeline').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_zaqar_config('drivers/message_store').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_zaqar_config('drivers/management_store').with_value('<SERVICE DEFAULT>')
       end
 
     end
diff --git a/spec/classes/zaqar_management_mongodb_spec.rb b/spec/classes/zaqar_management_mongodb_spec.rb
index ad203ea..ae03292 100644
--- a/spec/classes/zaqar_management_mongodb_spec.rb
+++ b/spec/classes/zaqar_management_mongodb_spec.rb
@@ -8,6 +8,7 @@ describe 'zaqar::management::mongodb' do
          password =>'foo',
        }
        class { 'zaqar':
+         management_store => 'mongodb',
        }"
 
     end
diff --git a/spec/classes/zaqar_messaging_mongodb_spec.rb b/spec/classes/zaqar_messaging_mongodb_spec.rb
index 54becd5..b44974d 100644
--- a/spec/classes/zaqar_messaging_mongodb_spec.rb
+++ b/spec/classes/zaqar_messaging_mongodb_spec.rb
@@ -8,6 +8,7 @@ describe 'zaqar::messaging::mongodb' do
          password =>'foo',
        }
        class { 'zaqar':
+         message_store => 'mongodb'
        }"
 
     end