diff --git a/manifests/params.pp b/manifests/params.pp
index 884fba542..f8c680cca 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -95,8 +95,8 @@ class nova::params {
       # debian specific nova config
       $root_helper                       = 'sudo nova-rootwrap'
       $lock_path                         = '/var/lock/nova'
-      case $::os_package_type {
-        'debian': {
+      case $::operatingsystem {
+        'Debian': {
           $api_metadata_service_name    = 'nova-api-metadata'
           $spicehtml5proxy_package_name = 'nova-consoleproxy'
           $spicehtml5proxy_service_name = 'nova-spicehtml5proxy'
diff --git a/manifests/spicehtml5proxy.pp b/manifests/spicehtml5proxy.pp
index c2fb164bc..ded3b5f53 100644
--- a/manifests/spicehtml5proxy.pp
+++ b/manifests/spicehtml5proxy.pp
@@ -56,7 +56,7 @@ class nova::spicehtml5proxy(
   # 3/ Start the service
   # Other OS don't need this scheduling and can use
   # the standard nova::generic_service
-  if $::os_package_type == 'debian' {
+  if $::operatingsystem == 'Debian' {
     if $enabled {
       file_line { '/etc/default/nova-consoleproxy:NOVA_CONSOLE_PROXY_TYPE':
         path    => '/etc/default/nova-consoleproxy',
diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp
index 380a10184..b75259baf 100644
--- a/manifests/vncproxy.pp
+++ b/manifests/vncproxy.pp
@@ -120,7 +120,7 @@ class nova::vncproxy(
   # 3/ Start the service
   # Other OS don't need this scheduling and can use
   # the standard nova::generic_service
-  if $::os_package_type == 'debian' {
+  if $::operatingsystem == 'Debian' {
     if $enabled {
       file_line { '/etc/default/nova-consoleproxy:NOVA_CONSOLE_PROXY_TYPE':
         path    => '/etc/default/nova-consoleproxy',
diff --git a/spec/classes/nova_api_spec.rb b/spec/classes/nova_api_spec.rb
index 6cfb02432..875cc802e 100644
--- a/spec/classes/nova_api_spec.rb
+++ b/spec/classes/nova_api_spec.rb
@@ -319,7 +319,7 @@ describe 'nova::api' do
 
   shared_examples 'nova-api on Debian' do
     context 'with default parameters' do
-      it { is_expected.to contain_service('nova-api- metadata').with(
+      it { is_expected.to contain_service('nova-api-metadata').with(
         :name      => 'nova-api-metadata',
         :ensure    => 'running',
         :hasstatus => true,
@@ -348,7 +348,7 @@ describe 'nova::api' do
         end
       end
       it_behaves_like 'nova-api'
-      if facts[:os_package_type] == 'debian'
+      if facts[:operatingsystem] == 'Debian'
         it_behaves_like 'nova-api on Debian'
       end
     end
diff --git a/spec/classes/nova_compute_libvirt_guests_spec.rb b/spec/classes/nova_compute_libvirt_guests_spec.rb
index e10488bf7..3d5c93cc8 100644
--- a/spec/classes/nova_compute_libvirt_guests_spec.rb
+++ b/spec/classes/nova_compute_libvirt_guests_spec.rb
@@ -74,9 +74,6 @@ describe 'nova::compute::libvirt_guests' do
 
       case [:osfamily]
       when 'RedHat'
-        let (:facts) do
-          facts.merge!(OSDefaults.get_facts({ :os_package_type => 'rpm' }))
-        end
         it_behaves_like 'redhat-nova-compute-libvirt-guests'
       end
     end
diff --git a/spec/classes/nova_serial_proxy_spec.rb b/spec/classes/nova_serial_proxy_spec.rb
index ab8c1ffbc..402db38e4 100644
--- a/spec/classes/nova_serial_proxy_spec.rb
+++ b/spec/classes/nova_serial_proxy_spec.rb
@@ -59,7 +59,7 @@ describe 'nova::serialproxy' do
       let (:platform_params) do
         case facts[:osfamily]
         when 'Debian'
-          if facts[:os_package_type] == 'debian'
+          if facts[:operatingsystem] == 'Debian'
             { :serialproxy_package_name => 'nova-consoleproxy',
               :serialproxy_service_name => 'nova-serialproxy' }
           else
diff --git a/spec/classes/nova_spicehtml5proxy_spec.rb b/spec/classes/nova_spicehtml5proxy_spec.rb
index d9d95450b..f39fe7386 100644
--- a/spec/classes/nova_spicehtml5proxy_spec.rb
+++ b/spec/classes/nova_spicehtml5proxy_spec.rb
@@ -67,19 +67,13 @@ describe 'nova::spicehtml5proxy' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        if facts[:operatingsystem] == 'Debian'
-          extra = { :os_package_type => 'debian' }
-        else
-          extra = {}
-        end
-
-        facts.merge!(OSDefaults.get_facts(extra))
+        facts.merge!(OSDefaults.get_facts())
       end
 
       let (:platform_params) do
         case facts[:osfamily]
         when 'Debian'
-          if facts[:os_package_type] == 'debian' then
+          if facts[:operatingsystem] == 'Debian' then
             package_name = 'nova-consoleproxy'
             service_name = 'nova-spicehtml5proxy'
           else
@@ -100,7 +94,7 @@ describe 'nova::spicehtml5proxy' do
 
       it_behaves_like 'nova::spicehtml5proxy'
 
-      if facts[:os_package_type] == 'debian'
+      if facts[:operatingsystem] == 'Debian'
         it_behaves_like 'nova::spicehtml5proxy on Debian'
       end
     end
diff --git a/spec/classes/nova_vnc_proxy_spec.rb b/spec/classes/nova_vnc_proxy_spec.rb
index 27ee4890a..e56aa5aa9 100644
--- a/spec/classes/nova_vnc_proxy_spec.rb
+++ b/spec/classes/nova_vnc_proxy_spec.rb
@@ -135,10 +135,6 @@ describe 'nova::vncproxy' do
       'include nova'
     end
 
-    before do
-      facts.merge!( :os_package_type => 'debian' )
-    end
-
     it { is_expected.to contain_file_line('/etc/default/nova-consoleproxy:NOVA_CONSOLE_PROXY_TYPE').with(
       :path    => '/etc/default/nova-consoleproxy',
       :match   => '^NOVA_CONSOLE_PROXY_TYPE=(.*)$',
@@ -160,7 +156,7 @@ describe 'nova::vncproxy' do
       let (:platform_params) do
         case facts[:osfamily]
         when 'Debian'
-          if facts[:os_package_type] == 'debian'
+          if facts[:operatingsystem] == 'Debian'
             { :nova_vncproxy_package => 'nova-consoleproxy',
               :nova_vncproxy_service => 'nova-novncproxy' }
           else
@@ -175,7 +171,7 @@ describe 'nova::vncproxy' do
 
       it_behaves_like 'nova_vnc_proxy'
 
-      if facts[:os_package_type] == 'debian'
+      if facts[:operatingsystem] == 'Debian'
         it_behaves_like 'nova_vnc_proxy debian package'
       end