diff --git a/conf/machine/qemu-cortex-m3.conf b/conf/machine/qemu-cortex-m3.conf
index aeb9a69..6a6d45e 100644
--- a/conf/machine/qemu-cortex-m3.conf
+++ b/conf/machine/qemu-cortex-m3.conf
@@ -5,7 +5,11 @@
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-cortexm3.inc
 
-# For runqemu (TBD)
+ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
+
+# For runqemu
 QB_SYSTEM_NAME = "qemu-system-arm"
 QB_MACHINE = "-machine lm3s6965evb"
-QB_OPT_APPEND = "-nographic -vga none -cpu=cortex-m3"
+QB_OPT_APPEND = "-nographic -vga none"
+QB_CPU = "-cpu cortex-m3"
+
diff --git a/conf/machine/qemu-nios2.conf b/conf/machine/qemu-nios2.conf
index d74017f..abc9574 100644
--- a/conf/machine/qemu-nios2.conf
+++ b/conf/machine/qemu-nios2.conf
@@ -5,7 +5,10 @@
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-nios2.inc
 
-# For runqemu (TBD)
+ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
+
+# For runqemu
 QB_SYSTEM_NAME = "qemu-system-nios2"
 QB_MACHINE = "-machine altera_10m50_zephyr"
-QB_OPT_APPEND = "-nographic -cpu=nios2"
+QB_OPT_APPEND = "-nographic"
+QB_CPU = "-cpu nios2"
diff --git a/conf/machine/qemu-x86.conf b/conf/machine/qemu-x86.conf
index 0d595a1..9a46809 100644
--- a/conf/machine/qemu-x86.conf
+++ b/conf/machine/qemu-x86.conf
@@ -5,7 +5,11 @@
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-i586.inc
 
-# For runqemu (TBD)
+ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
+
+# For runqemu
 QB_SYSTEM_NAME = "qemu-system-i386"
 QB_MACHINE = "-machine pc-0.14"
 QB_OPT_APPEND = "-nographic -display none -clock dynticks -no-acpi -balloon none"
+QB_CPU_x86 = "-cpu qemu32"
+QB_CPU_KVM_x86 = "-cpu kvm32"