diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
index 8f2cdd0e..c66e2bdf 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
+++ b/tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
@@ -18,6 +18,7 @@
     <type arch="x86_64">hvm</type>
     <loader readonly="yes" type="pflash">/usr/share/OVMF/OVMF_CODE.fd</loader>
     <boot dev="hd"/>
+    <smbios mode="emulate"/>
   </os>
   <features>
     <acpi/>
diff --git a/tests/clitest.py b/tests/clitest.py
index cd5e98f8..a62a9105 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -386,7 +386,7 @@ c.add_compare(""" \
 --vcpus 4 --cpuset=1,3-5 \
 --cpu host \
 --description \"foobar & baz\" \
---boot uefi \
+--boot uefi,smbios_mode=emulate \
 --security type=dynamic \
 --security type=none,model=dac \
 --numatune 1,2,3,5-7,^6 \
diff --git a/virtinst/cli.py b/virtinst/cli.py
index 05393e58..ee436539 100644
--- a/virtinst/cli.py
+++ b/virtinst/cli.py
@@ -1626,9 +1626,6 @@ class ParserBoot(VirtCLIParser):
         inst.set_initargs_string(val)
 
     def set_smbios_mode_cb(self, inst, val, virtarg):
-        if not val.startswith("emulate") and not val.startswith("host"):
-            inst.sysinfo.parse(val)
-            val = "sysinfo"
         inst.smbios_mode = val
         self.optdict["smbios_mode"] = val
 
@@ -1689,8 +1686,7 @@ ParserBoot.add_arg("kernel_args", "kernel_args",
 ParserBoot.add_arg("init", "init")
 ParserBoot.add_arg("machine", "machine")
 ParserBoot.add_arg("initargs", "initargs", cb=ParserBoot.set_initargs_cb)
-ParserBoot.add_arg("smbios_mode", "smbios_mode",
-                   can_comma=True, cb=ParserBoot.set_smbios_mode_cb)
+ParserBoot.add_arg("smbios_mode", "smbios_mode")
 
 # This is simply so the boot options are advertised with --boot help,
 # actual processing is handled by _parse