diff --git a/src/vmm_mad/remotes/kvm/prereconfigure b/src/vmm_mad/remotes/kvm/prereconfigure
index 3276251d48..f4ecf213cc 100755
--- a/src/vmm_mad/remotes/kvm/prereconfigure
+++ b/src/vmm_mad/remotes/kvm/prereconfigure
@@ -22,7 +22,7 @@ source $(dirname $0)/../../scripts_common.sh
 DOMAIN=$1
 TARGET_DEVICE=$2
 
-if [[ ! -z "$DOMAIN" ]] && [[ ! -z "$TARGET_DEVICE" ]]
+if [[ -n "$DOMAIN" ]] && [[ -n "$TARGET_DEVICE" ]]
 then
     CMD="virsh --connect $LIBVIRT_URI change-media $DOMAIN $TARGET_DEVICE \
         --eject --force"
diff --git a/src/vmm_mad/remotes/kvm/reconfigure b/src/vmm_mad/remotes/kvm/reconfigure
index aaeab05a09..a390966420 100755
--- a/src/vmm_mad/remotes/kvm/reconfigure
+++ b/src/vmm_mad/remotes/kvm/reconfigure
@@ -23,7 +23,7 @@ DOMAIN=$1
 TARGET_DEVICE=$2
 ISO_PATH=$3
 
-if [[ ! -z "$DOMAIN" ]] && [[ ! -z "$TARGET_DEVICE" ]] && [[ ! -z "$ISO_PATH" ]]
+if [[ -n "$DOMAIN" ]] && [[ -n "$TARGET_DEVICE" ]] && [[ -n "$ISO_PATH" ]]
 then
     CMD="virsh --connect $LIBVIRT_URI \
         change-media $DOMAIN $TARGET_DEVICE $ISO_PATH --insert"