diff --git a/ironic_tempest_plugin/tests/test_basic.py b/ironic_tempest_plugin/tests/test_basic.py
index 2dd316c..a6087e3 100644
--- a/ironic_tempest_plugin/tests/test_basic.py
+++ b/ironic_tempest_plugin/tests/test_basic.py
@@ -21,7 +21,6 @@
 class InspectorBasicTest(manager.InspectorScenarioTest):
 
     def verify_node_introspection_data(self, node):
-        self.assertEqual('yes', node['extra']['rule_success'])
         data = self.introspection_data(node['uuid'])
         self.assertEqual(data['cpu_arch'],
                          self.flavor['properties']['cpu_arch'])
@@ -58,7 +57,7 @@
             interval=self.wait_provisioning_state_interval)
 
     @decorators.idempotent_id('03bf7990-bee0-4dd7-bf74-b97ad7b52a4b')
-    @utils.services('compute', 'image', 'network', 'object_storage')
+    @utils.services('compute', 'image', 'network')
     def test_baremetal_introspection(self):
         """This smoke test case follows this set of operations:
 
@@ -93,7 +92,9 @@
 
         for node_id in self.node_ids:
             node = self.node_show(node_id)
-            self.verify_node_introspection_data(node)
+            self.assertEqual('yes', node['extra']['rule_success'])
+            if CONF.service_available.swift:
+                self.verify_node_introspection_data(node)
             self.verify_node_flavor(node)
 
         for node_id in self.node_ids:
diff --git a/ironic_tempest_plugin/tests/test_discovery.py b/ironic_tempest_plugin/tests/test_discovery.py
index 3880f60..f222810 100644
--- a/ironic_tempest_plugin/tests/test_discovery.py
+++ b/ironic_tempest_plugin/tests/test_discovery.py
@@ -143,7 +143,8 @@
 
         inspected_node = self.node_show(self.node_info['name'])
         self.verify_node_flavor(inspected_node)
-        self.verify_node_introspection_data(inspected_node)
+        if CONF.service_available.swift:
+            self.verify_node_introspection_data(inspected_node)
         self.verify_node_driver_info(self.node_info, inspected_node)
         self.assertEqual(ProvisionStates.ENROLL,
                          inspected_node['provision_state'])