diff --git a/test_suite/scripts/modules/20_install_mars.sh b/test_suite/scripts/modules/20_install_mars.sh
index d7835c39..725fb062 100644
--- a/test_suite/scripts/modules/20_install_mars.sh
+++ b/test_suite/scripts/modules/20_install_mars.sh
@@ -114,10 +114,11 @@ function install_mars_update_bootloader_on_target_hosts
         case "$boot_loader" in # ((
            lilo) label_name="${main_host_bootloader_label_list[$host]}"
                 lib_vmsg "checking label $label_name on host $host"
-                lib_remote_idfile $host lilo -I $label_name || lib_exit 1
+                lib_remote_idfile $host lilo -I "$label_name" || lib_exit 1
                 lib_vmsg "  calling lilo on $host"
                 lib_remote_idfile $host lilo || lib_exit 1
-                install_mars_activate_kernel_to_boot_with_lilo $host $label_name
+                install_mars_activate_kernel_to_boot_with_lilo $host \
+                                                               "$label_name"
                 ;;
               *) echo "hint: for bootloader $boot_loader on $host no action defined"
                 ;;
@@ -127,9 +128,9 @@ function install_mars_update_bootloader_on_target_hosts
 
 function install_mars_activate_kernel_to_boot_with_lilo
 {
-    local host=$1 label_name=$2
+    local host=$1 label_name="$2"
     lib_vmsg "  calling lilo -R $label_name on $host"
-    lib_remote_idfile $host lilo -R $label_name || lib_exit 1
+    lib_remote_idfile $host lilo -R "$label_name" || lib_exit 1
 }
 
 function install_mars_finish
diff --git a/test_suite/scripts/modules/55_remote_dev.sh b/test_suite/scripts/modules/55_remote_dev.sh
index b2a0d1ec..b97ec312 100644
--- a/test_suite/scripts/modules/55_remote_dev.sh
+++ b/test_suite/scripts/modules/55_remote_dev.sh
@@ -69,7 +69,7 @@ function remote_dev_run
     local mars_dev=$(lv_config_get_lv_device ${cluster_mars_dir_lv_name_list[$secondary_host]})
     crash_reboot $secondary_host "" $mars_dev $crash_maxtime_reboot \
                  $crash_maxtime_to_become_unreachable \
-                 $boot_label_name
+                 "$boot_label_name"
     remote_dev_remove_magic_links $secondary_host
 }
 
diff --git a/test_suite/scripts/modules/68_crash.sh b/test_suite/scripts/modules/68_crash.sh
index d9ea12a6..abb67f94 100644
--- a/test_suite/scripts/modules/68_crash.sh
+++ b/test_suite/scripts/modules/68_crash.sh
@@ -49,7 +49,7 @@ function crash_run
                                         $crash_aio_sync_mode
     crash_reboot $primary_host $secondary_host $mars_dev $crash_maxtime_reboot \
                  $crash_maxtime_to_become_unreachable \
-                 $boot_label_name
+                 "$boot_label_name"
 
     lib_linktree_print_linktree $primary_host
 
@@ -124,7 +124,7 @@ function crash_reboot
     [ $# -eq 6 ] || lib_exit 1 "wrong number $# of arguments (args = $*)"
     local primary_host=$1 secondary_host=$2 mars_dev=$3 maxtime_to_reboot=$4
     local maxtime_to_become_unreachable=$5
-    local boot_label_name=$6
+    local boot_label_name="$6"
     local pids_to_kill host
 
     if [ -z "$crash_print_linktree_during_reboot" ]; then
@@ -136,7 +136,7 @@ function crash_reboot
     fi
     if [ "${main_host_bootloader_list[$primary_host]}" = "lilo" ]; then
 	install_mars_activate_kernel_to_boot_with_lilo $primary_host \
-						       $boot_label_name
+						       "$boot_label_name"
     fi
 
     main_error_recovery_functions["lib_rw_stop_scripts"]=