diff --git a/spell.ignore b/spell.ignore
index 58393ba281..aad974a9f6 100644
--- a/spell.ignore
+++ b/spell.ignore
@@ -403,6 +403,7 @@ neighbours
 Netperf
 nohup
 numatune
+ovmf
 passfd
 pc
 postprocess
@@ -419,6 +420,7 @@ scp
 smp
 srv
 subprocess
+seabios
 tmpdir
 traceback
 umount
diff --git a/virttest/virsh.py b/virttest/virsh.py
index 18eba7dfca..78055788af 100644
--- a/virttest/virsh.py
+++ b/virttest/virsh.py
@@ -1580,7 +1580,9 @@ def undefine(name, options=None, **dargs):
     if options is not None:
         cmd += " %s" % options
 
-    if platform.machine() == "aarch64":
+    # When the platform is aarch64 or x86_64, both seabios and ovmf
+    # guests will use --nvram option
+    if platform.machine() in ["aarch64", "x86_64"]:
         if options is None or "--nvram" not in options:
             cmd += " --nvram"