diff --git a/_modules/runtest/tempest_sections/auth.py b/_modules/runtest/tempest_sections/auth.py
index 3d9b4ba..7f37e22 100644
--- a/_modules/runtest/tempest_sections/auth.py
+++ b/_modules/runtest/tempest_sections/auth.py
@@ -55,10 +55,6 @@
         # Assume if barbican is enabled in nova, its integration enabled globally.
 
         roles = []
-        contrail_enabled = conditions.BaseRule('*.opencontrail.control.enabled',
-                                               'eq', True, multiple='any')
-        if contrail_enabled.check(self.pillar):
-            roles.append("admin")
         c = conditions.BaseRule('nova.controller.enabled', 'eq', True)
         if self.get_item_when_condition_match('nova.controller.barbican.enabled', c):
             roles.append("creator")
diff --git a/_modules/runtest/tempest_sections/patrole_plugin.py b/_modules/runtest/tempest_sections/patrole_plugin.py
index 20f6a76..8276169 100644
--- a/_modules/runtest/tempest_sections/patrole_plugin.py
+++ b/_modules/runtest/tempest_sections/patrole_plugin.py
@@ -25,12 +25,7 @@
 
     @property
     def custom_policy_files(self):
-        contrail_enabled = conditions.BaseRule('*.opencontrail.control.enabled',
-                                               'eq', True, multiple='any')
-        if contrail_enabled.check(self.pillar):
-            return '/etc/opencontrail/policy.json'
-        else:
-            pass
+        pass
 
     @property
     def test_custom_requirements(self):