diff --git a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py
index b1ddecc..10b6663 100644
--- a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py
+++ b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py
@@ -85,6 +85,8 @@
     deploy_interface = 'iscsi'
     raid_interface = 'agent'
     api_microversion = '1.31'
+    # Software RAID is always local boot
+    boot_option = 'local'
 
     raid_config = {
         "logical_disks": [
@@ -125,6 +127,8 @@
     deploy_interface = 'direct'
     raid_interface = 'agent'
     api_microversion = '1.31'
+    # Software RAID is always local boot
+    boot_option = 'local'
 
     # TODO(dtantsur): more complex layout in this job
     raid_config = {
diff --git a/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py b/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
index 0cfbff0..cc6b0dd 100644
--- a/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
+++ b/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
@@ -27,7 +27,7 @@
 
 
 class BaremetalBasicOps(baremetal_manager.BaremetalScenarioTest):
-    """This smoke test tests the pxe_ssh Ironic driver.
+    """This smoke test tests an Ironic driver.
 
     It follows this basic set of operations:
         * Creates a keypair