diff --git a/manifests/params.pp b/manifests/params.pp
index 08edfe3c..1dc67dcf 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,13 +4,7 @@
 #
 class cinder::params {
   include ::openstacklib::defaults
-
-  if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
-    ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-    $pyvers = '3'
-  } else {
-    $pyvers = ''
-  }
+  $pyvers = $::openstacklib::defaults::pyvers
 
   $client_package            = "python${pyvers}-cinderclient"
   $group                     = 'cinder'
diff --git a/spec/classes/cinder_client_spec.rb b/spec/classes/cinder_client_spec.rb
index b6a54e22..265de9b3 100644
--- a/spec/classes/cinder_client_spec.rb
+++ b/spec/classes/cinder_client_spec.rb
@@ -46,11 +46,7 @@ describe 'cinder::client' do
       let(:platform_params) do
         case facts[:osfamily]
         when 'Debian'
-          if facts[:os_package_type] == 'debian'
-            { :client_package_name => 'python3-cinderclient' }
-          else
-            { :client_package_name => 'python-cinderclient' }
-          end
+          { :client_package_name => 'python3-cinderclient' }
         when 'RedHat'
           { :client_package_name => 'python-cinderclient' }
         end