diff --git a/barbican_tempest_plugin/tests/scenario/manager.py b/barbican_tempest_plugin/tests/scenario/manager.py
index f91e27b..4a141ab 100644
--- a/barbican_tempest_plugin/tests/scenario/manager.py
+++ b/barbican_tempest_plugin/tests/scenario/manager.py
@@ -220,6 +220,9 @@
                   'imageRef': imageRef,
                   'volume_type': volume_type,
                   'size': size}
+        if CONF.compute.compute_volume_common_az:
+            kwargs.setdefault('availability_zone',
+                              CONF.compute.compute_volume_common_az)
         volume = self.volumes_client.create_volume(**kwargs)['volume']
 
         self.addCleanup(self.volumes_client.wait_for_resource_deletion,
diff --git a/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py b/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py
index c7038c2..f9191bf 100644
--- a/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py
+++ b/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py
@@ -12,6 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import testtools
+
 from oslo_log import log as logging
 from tempest.common import utils
 from tempest import config
@@ -105,6 +107,8 @@
                                               volume_type='luks')
         self.attach_detach_volume(server, volume, keypair)
 
+    @testtools.skipIf(CONF.volume.storage_protocol == 'ceph',
+                      'PLAIN encryptor provider is not supported on rbd')
     @decorators.idempotent_id('cbc752ed-b716-4727-910f-956ccf965723')
     @utils.services('compute', 'volume', 'image')
     def test_encrypted_cinder_volumes_cryptsetup(self):
diff --git a/barbican_tempest_plugin/tests/test_barbican_tempest_plugin.py b/barbican_tempest_plugin/tests/test_barbican_tempest_plugin.py
deleted file mode 100644
index 1c827f6..0000000
--- a/barbican_tempest_plugin/tests/test_barbican_tempest_plugin.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-"""
-test_barbican_tempest_plugin
-----------------------------------
-
-Tests for `barbican_tempest_plugin` module.
-"""
-
-from tempest.lib import decorators
-
-from barbican_tempest_plugin.tests import base
-
-
-class TestBarbican_tempest_plugin(base.TestCase):
-
-    @decorators.idempotent_id('8abf6dec-37b9-43ca-95cf-b8ebecda3c8d')
-    def test_something(self):
-        pass
diff --git a/setup.cfg b/setup.cfg
index ec9e3ce..85c66cf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,11 @@
 [metadata]
 name = barbican_tempest_plugin
 summary = OpenStack barbican tempest tests.
-description-file =
-    README.rst
+long_description = file: README.rst
 author = OpenStack
-author-email = openstack-dev@lists.openstack.org
-home-page = http://www.openstack.org/
-requires-python = >=3.6
+author_email = openstack-dev@lists.openstack.org
+url = http://www.openstack.org/
+python_requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology