diff --git a/scripts/runqemu b/scripts/runqemu
index d95711b191..b4cc9de139 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -125,7 +125,7 @@ while true; do
             [ -z "$MACHINE" -o "$MACHINE" = "$arg" ] && MACHINE=$arg || \
                 error "conflicting MACHINE types [$MACHINE] and [$arg]"
             ;;
-        "ext"[234] | "jffs2" | "nfs" | "btrfs")
+        "ext"[234] | "jffs2" | "nfs" | "btrfs" | "iso")
             check_fstype_conflicts $arg
             ;;
         "hddimg" | "hdddirect" | "wic" | "vmdk" | "qcow2" | "vdi")
@@ -134,12 +134,7 @@ while true; do
             ;;
         "ramfs")
             FSTYPE=cpio.gz
-            RAMFS=true
             ;;
-        "iso")
-            FSTYPE=iso
-            ISOFS=true
-	    ;;
         "nographic")
             SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -nographic"
             SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 89a1e1ba27..6fa93c9d07 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -593,12 +593,12 @@ if [ "$MACHINE" = "qemuzynq" ]; then
     fi
 fi
 
-if [ "x$RAMFS" = "xtrue" ]; then
+if [ "$FSTYPE" = "cpio.gz" ]; then
     QEMUOPTIONS="-initrd $ROOTFS -nographic"
     KERNCMDLINE="root=/dev/ram0 console=ttyS0 debugshell"
 fi
 
-if [ "x$ISOFS" = "xtrue" ]; then
+if [ "$FSTYPE" = "iso" ]; then
     QEMUOPTIONS="$QEMU_NETWORK_CMD -cdrom $ROOTFS $QEMU_UI_OPTIONS"
 fi