diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index 0884085f..9ddd9c0d 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -38,6 +38,10 @@ class cinder::scheduler (
     cinder_config {
       'DEFAULT/scheduler_driver': value => $scheduler_driver;
     }
+  } else {
+    cinder_config {
+      'DEFAULT/scheduler_driver': ensure => absent;
+    }
   }
 
   if $::cinder::params::scheduler_package {
diff --git a/spec/classes/cinder_scheduler_spec.rb b/spec/classes/cinder_scheduler_spec.rb
index 9cdab1db..9e5571a0 100644
--- a/spec/classes/cinder_scheduler_spec.rb
+++ b/spec/classes/cinder_scheduler_spec.rb
@@ -11,11 +11,12 @@ describe 'cinder::scheduler' do
     describe 'with default parameters' do
 
       it { is_expected.to contain_class('cinder::params') }
+      it { is_expected.to contain_cinder_config('DEFAULT/scheduler_driver').with_ensure('absent') }
 
       it { is_expected.to contain_package('cinder-scheduler').with(
         :name      => 'cinder-scheduler',
         :ensure    => 'present',
-        :before    => 'Service[cinder-scheduler]'
+        :before    => ['Cinder_config[DEFAULT/scheduler_driver]','Service[cinder-scheduler]'],
       ) }
 
       it { is_expected.to contain_service('cinder-scheduler').with(