diff --git a/manifests/params.pp b/manifests/params.pp
index cb292eeb6..22d772854 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -3,7 +3,8 @@
 #
 class keystone::params {
   include ::openstacklib::defaults
-  if ($::os_package_type == 'debian') {
+  if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
+     ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
     $pyvers = '3'
   } else {
     $pyvers = ''
diff --git a/spec/classes/keystone_client_spec.rb b/spec/classes/keystone_client_spec.rb
index 5fa42a783..c99b0c409 100644
--- a/spec/classes/keystone_client_spec.rb
+++ b/spec/classes/keystone_client_spec.rb
@@ -3,7 +3,10 @@ require 'spec_helper'
 describe 'keystone::client' do
 
   let :facts do
-    @default_facts.merge({ :osfamily => 'Debian' })
+    @default_facts.merge({
+       :osfamily => 'Debian',
+       :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
+    })
   end
 
   describe "with default parameters" do
diff --git a/spec/classes/keystone_db_mysql_spec.rb b/spec/classes/keystone_db_mysql_spec.rb
index 3de968dab..239c3dcb7 100644
--- a/spec/classes/keystone_db_mysql_spec.rb
+++ b/spec/classes/keystone_db_mysql_spec.rb
@@ -10,7 +10,10 @@ describe 'keystone::db::mysql' do
   end
 
   let :facts do
-    @default_facts.merge({ :osfamily => 'Debian' })
+    @default_facts.merge({
+       :osfamily => 'Debian',
+       :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
+    })
   end
 
   let :params do
diff --git a/spec/classes/keystone_disable_admin_token_auth_spec.rb b/spec/classes/keystone_disable_admin_token_auth_spec.rb
index 83486f227..764b26a35 100644
--- a/spec/classes/keystone_disable_admin_token_auth_spec.rb
+++ b/spec/classes/keystone_disable_admin_token_auth_spec.rb
@@ -2,7 +2,10 @@ require 'spec_helper'
 
 describe 'keystone::disable_admin_token_auth' do
   let :facts do
-    @default_facts.merge(:osfamily => 'Debian')
+    @default_facts.merge({
+       :osfamily => 'Debian',
+       :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
+    })
   end
 
   let :pre_condition do
diff --git a/spec/classes/keystone_init_spec.rb b/spec/classes/keystone_init_spec.rb
index e8327342e..ae96d54ab 100644
--- a/spec/classes/keystone_init_spec.rb
+++ b/spec/classes/keystone_init_spec.rb
@@ -14,6 +14,7 @@ describe 'keystone' do
       :osfamily               => 'Debian',
       :operatingsystem        => 'Debian',
       :operatingsystemrelease => '7.0',
+      :os                     => { :name  => 'Debian', :family => 'Debian', :release => { :major => '7', :minor => '0' } },
     }))
   end
 
@@ -1189,7 +1190,8 @@ describe 'keystone' do
       @default_facts.merge(global_facts.merge({
         :osfamily               => 'RedHat',
         :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '7.0'
+        :operatingsystemrelease => '7.0',
+        :os                     => { :name  => 'RedHat', :family => 'RedHat', :release => { :major => '7', :minor => '0' } },
       }))
     end
 
@@ -1209,7 +1211,8 @@ describe 'keystone' do
       @default_facts.merge(global_facts.merge({
         :osfamily               => 'Debian',
         :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '7.0'
+        :operatingsystemrelease => '7.0',
+        :os                     => { :name  => 'Debian', :family => 'Debian', :release => { :major => '7', :minor => '0' } },
       }))
     end
 
diff --git a/spec/classes/keystone_roles_admin_spec.rb b/spec/classes/keystone_roles_admin_spec.rb
index a322e88ac..b54137aa2 100644
--- a/spec/classes/keystone_roles_admin_spec.rb
+++ b/spec/classes/keystone_roles_admin_spec.rb
@@ -12,6 +12,7 @@ describe 'keystone::roles::admin' do
       :operatingsystem        => 'Debian',
       :operatingsystemrelease => '7.0',
       :os_workers             => 1,
+      :os                     => { :name  => 'Debian', :family => 'Debian', :release => { :major => '7', :minor => '0' } },
     })
   end
 
diff --git a/spec/classes/keystone_service_spec.rb b/spec/classes/keystone_service_spec.rb
index 44f2ee88d..9a7967687 100644
--- a/spec/classes/keystone_service_spec.rb
+++ b/spec/classes/keystone_service_spec.rb
@@ -3,7 +3,10 @@ require 'spec_helper'
 describe 'keystone::service' do
 
   let :facts do
-    @default_facts.merge({ :osfamily => 'Debian' })
+    @default_facts.merge({
+       :osfamily => 'Debian',
+       :os       => { :name  => 'Debian', :family => 'Debian', :release => { :major => '8', :minor => '0' } },
+    })
   end
 
   describe "with default parameters" do