diff --git a/spec/classes/glance_backend_rbd_spec.rb b/spec/classes/glance_backend_rbd_spec.rb
index dba6a1f5..77b8da04 100644
--- a/spec/classes/glance_backend_rbd_spec.rb
+++ b/spec/classes/glance_backend_rbd_spec.rb
@@ -1,80 +1,107 @@
 require 'spec_helper'
 
 describe 'glance::backend::rbd' do
-  let :facts do
-      @default_facts.merge({
-        :osfamily       => 'Debian',
-      })
-  end
+  shared_examples 'glance::backend::rbd' do
+    context 'with default params' do
+      it { should contain_glance_api_config('glance_store/default_store').with_value('rbd') }
+      it { should contain_glance_api_config('glance_store/rbd_store_pool').with_value('<SERVICE DEFAULT>') }
+      it { should contain_glance_api_config('glance_store/rbd_store_ceph_conf').with_value('<SERVICE DEFAULT>') }
+      it { should contain_glance_api_config('glance_store/rbd_store_chunk_size').with_value('<SERVICE DEFAULT>') }
+      it { should contain_glance_api_config('glance_store/rados_connect_timeout').with_value('<SERVICE DEFAULT>')}
+      it { should contain_glance_api_config('glance_store/rbd_store_user').with_value('<SERVICE DEFAULT>')}
 
-  describe 'with default params' do
-
-    it { is_expected.to contain_glance_api_config('glance_store/default_store').with_value('rbd') }
-    it { is_expected.to contain_glance_api_config('glance_store/rbd_store_pool').with_value('<SERVICE DEFAULT>') }
-    it { is_expected.to contain_glance_api_config('glance_store/rbd_store_ceph_conf').with_value('<SERVICE DEFAULT>') }
-    it { is_expected.to contain_glance_api_config('glance_store/rbd_store_chunk_size').with_value('<SERVICE DEFAULT>') }
-    it { is_expected.to contain_glance_api_config('glance_store/rados_connect_timeout').with_value('<SERVICE DEFAULT>')}
-    it { is_expected.to contain_glance_api_config('glance_store/rbd_store_user').with_value('<SERVICE DEFAULT>')}
-
-    it { is_expected.to contain_package('python-ceph').with(
-        :name   => 'python-ceph',
+      it { should contain_package('python-ceph').with(
+        :name   => platform_params[:pyceph_package_name],
         :ensure => 'present'
-      )
-    }
-  end
-
-  describe 'when passing params' do
-    let :params do
-      {
-        :rbd_store_user        => 'user',
-        :rbd_store_chunk_size  => '2',
-        :package_ensure        => 'latest',
-        :rados_connect_timeout => '30',
-      }
+      )}
     end
-    it { is_expected.to contain_glance_api_config('glance_store/rbd_store_user').with_value('user') }
-    it { is_expected.to contain_glance_api_config('glance_store/rbd_store_chunk_size').with_value('2') }
-    it { is_expected.to contain_glance_api_config('glance_store/rados_connect_timeout').with_value('30')}
-    it { is_expected.to contain_package('python-ceph').with(
-        :name   => 'python-ceph',
+
+    context 'when passing params' do
+      let :params do
+        {
+          :rbd_store_user        => 'user',
+          :rbd_store_chunk_size  => '2',
+          :package_ensure        => 'latest',
+          :rados_connect_timeout => '30',
+        }
+      end
+
+      it { should contain_glance_api_config('glance_store/rbd_store_user').with_value('user') }
+      it { should contain_glance_api_config('glance_store/rbd_store_chunk_size').with_value('2') }
+      it { should contain_glance_api_config('glance_store/rados_connect_timeout').with_value('30')}
+
+      it { should contain_package('python-ceph').with(
+        :name   => platform_params[:pyceph_package_name],
         :ensure => 'latest'
-      )
-    }
+     )}
+    end
+
+    context 'when not managing packages' do
+      let :params do
+        {
+          :manage_packages => false,
+        }
+      end
+
+      it { should_not contain_package('python-ceph') }
+    end
   end
 
-  describe 'package on RedHat platform el6' do
-    let :facts do
-      @default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6.5',
-      })
-    end
-    it { is_expected.to contain_package('python-ceph').with(
+  shared_examples 'glance::backend::rbd on RedHat' do
+    context 'when el6' do
+      before do
+        facts.merge!( :operatingsystemrelease => '6.5' )
+      end
+
+      it { should contain_package('python-ceph').with(
         :name   => 'python-ceph',
         :ensure => 'present'
-      )
-    }
-  end
-  describe 'package on RedHat platform el7' do
-    let :facts do
-      @default_facts.merge({
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '7.0'
-      })
+      )}
     end
-    it { is_expected.to contain_package('python-ceph').with(
+
+    context 'when el7' do
+      before do
+        facts.merge!( :operatingsystemrelease => '7.0' )
+      end
+
+      it { should contain_package('python-ceph').with(
         :name   => 'python-rbd',
         :ensure => 'present'
-      )
-    }
+      )}
+    end
   end
 
-  describe 'when not managing packages' do
-    let :params do
-      {
-        :manage_packages       => false,
-      }
+  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())
+      end
+
+      let(:platform_params) do
+        case facts[:osfamily]
+        when 'Debian'
+          if facts[:os_package_type] == 'debian' then
+            pyceph_pkg = 'python3-ceph'
+          else
+            pyceph_pkg = 'python-ceph'
+          end
+          {
+            :pyceph_package_name => pyceph_pkg,
+          }
+        when 'RedHat'
+          {
+            :pyceph_package_name => 'python-rbd',
+          }
+        end
+      end
+
+      it_behaves_like 'glance::backend::rbd'
+
+      if facts[:osfamily] == 'RedHat'
+        it_behaves_like 'glance::backend::rbd on RedHat'
+      end
     end
-    it { is_expected.not_to contain_package('python-ceph') }
   end
 end