diff --git a/patrole_tempest_plugin/rbac_rule_validation.py b/patrole_tempest_plugin/rbac_rule_validation.py
index 7f9d4d2..ee32f78 100644
--- a/patrole_tempest_plugin/rbac_rule_validation.py
+++ b/patrole_tempest_plugin/rbac_rule_validation.py
@@ -28,8 +28,14 @@
 def action(service, rule):
     def decorator(func):
         def wrapper(*args, **kwargs):
-            authority = rbac_auth.RbacAuthority(
-                args[0].auth_provider.credentials.tenant_id, service)
+            try:
+                tenant_id = args[0].auth_provider.credentials.tenant_id
+            except (IndexError, AttributeError) as e:
+                msg = ("{0}: tenant_id not found in "
+                       "cls.auth_provider.credentials".format(e))
+                LOG.error(msg)
+                raise rbac_exceptions.RbacResourceSetupFailed(msg)
+            authority = rbac_auth.RbacAuthority(tenant_id, service)
             allowed = authority.get_permission(rule, CONF.rbac.rbac_test_role)
 
             try:
diff --git a/patrole_tempest_plugin/tests/api/compute/__init__.py b/patrole_tempest_plugin/tests/api/compute/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/compute/__init__.py
diff --git a/patrole_tempest_plugin/tests/api/compute/rbac_base.py b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
new file mode 100644
index 0000000..030ee5c
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/compute/rbac_base.py
@@ -0,0 +1,38 @@
+# Copyright 2017 AT&T Corporation
+#    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.
+
+from tempest.api.compute import base as compute_base
+from tempest import config
+
+CONF = config.CONF
+
+
+class BaseV2ComputeRbacTest(compute_base.BaseV2ComputeTest):
+
+    credentials = ['primary', 'admin']
+
+    @classmethod
+    def skip_checks(cls):
+        super(BaseV2ComputeRbacTest, cls).skip_checks()
+        if not CONF.rbac.rbac_flag:
+            raise cls.skipException(
+                '%s skipped as RBAC flag not enabled' % cls.__name__)
+        if 'admin' not in CONF.auth.tempest_roles:
+            raise cls.skipException(
+                "%s skipped because tempest roles is not admin" % cls.__name__)
+
+    @classmethod
+    def setup_clients(cls):
+        super(BaseV2ComputeRbacTest, cls).setup_clients()
+        cls.admin_client = cls.os_admin.agents_client
+        cls.auth_provider = cls.os.auth_provider
diff --git a/patrole_tempest_plugin/tests/api/compute/test_absolute_limits_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_absolute_limits_rbac.py
new file mode 100644
index 0000000..3da3bd8
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/compute/test_absolute_limits_rbac.py
@@ -0,0 +1,47 @@
+# Copyright 2017 AT&T Corporation
+#    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.
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.compute import rbac_base
+from tempest import config
+from tempest.lib import decorators
+
+CONF = config.CONF
+
+
+class RBACAbsoluteLimitsTestJSON(rbac_base.BaseV2ComputeRbacTest):
+
+    def tearDown(self):
+        rbac_utils.switch_role(self, switchToRbacRole=False)
+        super(RBACAbsoluteLimitsTestJSON, self).tearDown()
+
+    @classmethod
+    def setup_clients(cls):
+        super(RBACAbsoluteLimitsTestJSON, cls).setup_clients()
+        cls.identity_client = cls.os_adm.identity_client
+        cls.tenants_client = cls.os_adm.tenants_client
+
+    @classmethod
+    def skip_checks(cls):
+        super(RBACAbsoluteLimitsTestJSON, cls).skip_checks()
+        if not CONF.compute_feature_enabled.api_extensions:
+            raise cls.skipException(
+                '%s skipped as no compute extensions enabled' % cls.__name__)
+
+    @rbac_rule_validation.action(service="nova",
+                                 rule="os_compute_api:os-used-limits")
+    @decorators.idempotent_id('3fb60f83-9a5f-4fdd-89d9-26c3710844a1')
+    def test_used_limits_for_admin_rbac(self):
+        rbac_utils.switch_role(self, switchToRbacRole=True)
+        self.limits_client.show_limits()
diff --git a/patrole_tempest_plugin/tests/api/image/v2/__init__.py b/patrole_tempest_plugin/tests/api/image/v2/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/image/v2/__init__.py
diff --git a/patrole_tempest_plugin/tests/api/volume/test_availability_zone_rbac.py b/patrole_tempest_plugin/tests/api/volume/test_availability_zone_rbac.py
new file mode 100644
index 0000000..d6426dd
--- /dev/null
+++ b/patrole_tempest_plugin/tests/api/volume/test_availability_zone_rbac.py
@@ -0,0 +1,42 @@
+# Copyright 2017 AT&T Corporation.
+# All Rights Reserved.
+#
+#    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.
+
+from tempest import config
+from tempest.lib import decorators
+
+from patrole_tempest_plugin import rbac_rule_validation
+from patrole_tempest_plugin.rbac_utils import rbac_utils
+from patrole_tempest_plugin.tests.api.volume import rbac_base
+
+CONF = config.CONF
+
+
+class AvailabilityZoneRbacTest(rbac_base.BaseVolumeRbacTest):
+
+    @classmethod
+    def setup_clients(cls):
+        super(AvailabilityZoneRbacTest, cls).setup_clients()
+        cls.client = cls.availability_zone_client
+
+    def tearDown(self):
+        rbac_utils.switch_role(self, switchToRbacRole=False)
+        super(AvailabilityZoneRbacTest, self).tearDown()
+
+    @rbac_rule_validation.action(service="cinder",
+                                 rule="volume:availability_zone_list")
+    @decorators.idempotent_id('8cfd920c-4b6c-402d-b6e2-ede86bedc702')
+    def test_get_availability_zone_list(self):
+        rbac_utils.switch_role(self, switchToRbacRole=True)
+        self.client.list_availability_zones()