diff --git a/spec/classes/nova_db_sync_api_spec.rb b/spec/classes/nova_db_sync_api_spec.rb
index ca267a78b..ff287b7c3 100644
--- a/spec/classes/nova_db_sync_api_spec.rb
+++ b/spec/classes/nova_db_sync_api_spec.rb
@@ -31,29 +31,19 @@ describe 'nova::db::sync_api' do
   end
 
 
-  context 'on a RedHat osfamily' do
-    let :facts do
-     @default_facts.merge({
-        :osfamily                 => 'RedHat',
-        :operatingsystemrelease   => '7.0',
-        :concat_basedir => '/var/lib/puppet/concat'
-      })
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({
+          :processorcount => 8,
+          :concat_basedir => '/var/lib/puppet/concat'
+        }))
+      end
+
+      it_configures 'nova-dbsync-api'
     end
-
-    it_configures 'nova-dbsync-api'
-  end
-
-  context 'on a Debian osfamily' do
-    let :facts do
-      @default_facts.merge({
-        :operatingsystemrelease => '7.8',
-        :operatingsystem        => 'Debian',
-        :osfamily               => 'Debian',
-        :concat_basedir => '/var/lib/puppet/concat'
-      })
-    end
-
-    it_configures 'nova-dbsync-api'
   end
 
 end
diff --git a/spec/classes/nova_db_sync_spec.rb b/spec/classes/nova_db_sync_spec.rb
index 69c71a1ec..fd3e7d24a 100644
--- a/spec/classes/nova_db_sync_spec.rb
+++ b/spec/classes/nova_db_sync_spec.rb
@@ -31,29 +31,19 @@ describe 'nova::db::sync' do
   end
 
 
-  context 'on a RedHat osfamily' do
-    let :facts do
-     @default_facts.merge({
-        :osfamily                 => 'RedHat',
-        :operatingsystemrelease   => '7.0',
-        :concat_basedir => '/var/lib/puppet/concat'
-      })
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge(OSDefaults.get_facts({
+          :processorcount => 8,
+          :concat_basedir => '/var/lib/puppet/concat'
+        }))
+      end
+
+      it_configures 'nova-dbsync'
     end
-
-    it_configures 'nova-dbsync'
-  end
-
-  context 'on a Debian osfamily' do
-    let :facts do
-      @default_facts.merge({
-        :operatingsystemrelease => '7.8',
-        :operatingsystem        => 'Debian',
-        :osfamily               => 'Debian',
-        :concat_basedir => '/var/lib/puppet/concat'
-      })
-    end
-
-    it_configures 'nova-dbsync'
   end
 
 end