diff --git a/attributes/default.rb b/attributes/default.rb
index d9f2541..9f9d2af 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -97,7 +97,6 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
     'cinder_backup_service' => 'openstack-cinder-backup',
     'cinder_iscsitarget_packages' => ['targetcli', 'dbus-python'],
     'cinder_iscsitarget_service' => 'target',
-    'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
     'cinder_nfs_packages' => ['nfs-utils', 'nfs-utils-lib'],
     'cinder_emc_packages' => ['pywbem'],
     'cinder_svc_packages' => ['sysfsutils'],
@@ -117,7 +116,6 @@ when 'debian'
     'cinder_scheduler_service' => 'cinder-scheduler',
     'cinder_backup_packages' => ['cinder-backup'],
     'cinder_backup_service' => 'cinder-backup',
-    'cinder_ceph_packages' => ['python-ceph', 'ceph-common'],
     'cinder_iscsitarget_packages' => ['targetcli'],
     'cinder_iscsitarget_service' => 'tgt',
     'cinder_nfs_packages' => ['nfs-common'],
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index fc43260..6e06650 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -164,12 +164,6 @@ describe 'openstack-block-storage::cinder-common' do
           end
         end
 
-        context 'rbd attributes' do
-          before do
-            node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.rbd.RBDDriver'
-          end
-        end
-
         context 'netapp ISCSI settings' do
           before do
             node.set['openstack']['block-storage']['conf']['DEFAULT']['volume_driver'] = 'cinder.volume.drivers.netapp.NetAppISCSIDriver'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cb91497..1e774ca 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -31,9 +31,6 @@ shared_context 'block-storage-stubs' do
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('db', anything)
       .and_return('')
-    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
-      .with('token', 'rbd_secret_uuid')
-      .and_return('b0ff3bba-e07b-49b1-beed-09a45552b1ad')
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('token', 'openstack_vmware_secret_name')
       .and_return 'vmware_secret_name'
@@ -46,9 +43,6 @@ shared_context 'block-storage-stubs' do
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('service', 'openstack-block-storage')
       .and_return('cinder-pass')
-    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
-      .with('service', 'openstack_image_cephx_key')
-      .and_return('cephx-key')
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'admin')
       .and_return('emc_test_pass')