diff --git a/spec/acceptance/mysql_spec.rb b/spec/acceptance/mysql_spec.rb
index 590a17a6..00889718 100644
--- a/spec/acceptance/mysql_spec.rb
+++ b/spec/acceptance/mysql_spec.rb
@@ -25,8 +25,10 @@ describe 'openstacklib mysql' do
       it { is_expected.to be_listening.with('tcp') }
     end
 
-    describe command("mysql -e 'show databases;' | grep -q beaker") do
-      it { should return_exit_status 0 }
+    describe 'test database listing' do
+      it 'should list beaker database' do
+        expect(shell("mysql -e 'show databases;'|grep -q beaker").exit_code).to be_zero
+      end
     end
 
   end
diff --git a/spec/acceptance/rabbitmq_spec.rb b/spec/acceptance/rabbitmq_spec.rb
index 4b82b822..7f727710 100644
--- a/spec/acceptance/rabbitmq_spec.rb
+++ b/spec/acceptance/rabbitmq_spec.rb
@@ -47,13 +47,19 @@ describe 'openstacklib class' do
       apply_manifest(pp, :catch_changes => true)
     end
 
-    describe command("rabbitmqctl list_users") do
-      it { should return_stdout /^beaker/ }
-      it { should_not return_stdout /^guest/ }
-    end
+    describe 'test rabbitmq resources' do
+      it 'should list rabbitmq beaker resources' do
+        shell('rabbitmqctl list_users') do |r|
+          expect(r.stdout).to match(/^beaker/)
+          expect(r.stdout).not_to match(/^guest/)
+          expect(r.exit_code).to eq(0)
+        end
 
-    describe command('rabbitmqctl list_permissions') do
-      it { should return_stdout /^beaker\t\.\*\t\.\*\t\.\*$/ }
+        shell('rabbitmqctl list_permissions') do |r|
+          expect(r.stdout).to match(/^beaker\t\.\*\t\.\*\t\.\*$/)
+          expect(r.exit_code).to eq(0)
+        end
+      end
     end
 
   end