diff --git a/qemu/tests/cfg/multi_disk.cfg b/qemu/tests/cfg/multi_disk.cfg
index fc373b65f119b89785c7949fb9e542b73ec2a860..21bd1e153198c7bcf5451eb30f9752cb980e9327 100644
--- a/qemu/tests/cfg/multi_disk.cfg
+++ b/qemu/tests/cfg/multi_disk.cfg
@@ -23,6 +23,7 @@
             cdroms = ""
             ide:
                 # 3 + boot disk = 4 disks
+                image_extra_params = ""
                 stg_image_num = 3
                 stg_params  = "image_size:1G,10G,5G "
                 stg_params += "image_format:qcow2,qcow2,raw "
diff --git a/tests/boot_savevm.py b/tests/boot_savevm.py
index a79de410eaf1073c2b4db748b7f4b8a146d62e7a..d1bae381ec1692ba82c8049a60f4fbd0bb2155ab 100644
--- a/tests/boot_savevm.py
+++ b/tests/boot_savevm.py
@@ -34,9 +34,9 @@ def run_boot_savevm(test, params, env):
         vm.create(params=params)
 
     vm.verify_alive() # This shouldn't require logging in to guest
-    savevm_delay = float(params.get("savevm_delay"))
-    savevm_login_delay = float(params.get("savevm_login_delay"))
-    savevm_login_timeout = float(params.get("savevm_timeout"))
+    savevm_delay = float(params["savevm_delay"])
+    savevm_login_delay = float(params["savevm_login_delay"])
+    savevm_login_timeout = float(params["savevm_timeout"])
     savevm_statedir = params.get("savevm_statedir", tempfile.gettempdir())
     fd, savevm_statefile = tempfile.mkstemp(suffix='.img', prefix=vm.name+'-',
                                             dir=savevm_statedir)
diff --git a/tests/cfg/block_hotplug.cfg b/tests/cfg/block_hotplug.cfg
index ede1ad2d257c4a5cc1e2327daaea286ff7f5175b..84d5b0408cdd568d0f301bf7c27b59d46f76997d 100644
--- a/tests/cfg/block_hotplug.cfg
+++ b/tests/cfg/block_hotplug.cfg
@@ -16,10 +16,12 @@
     kill_vm_on_error = yes
     variants:
         - fmt_qcow2:
+            image_extra_params = ""
             image_format_stg = qcow2
             image_format_stg0 = qcow2
             image_format_stg1 = qcow2
         - fmt_raw:
+            image_extra_params = ""
             image_format_stg = raw
             image_format_stg0 = raw
             image_format_stg1 = raw
diff --git a/tests/cfg/guest_suspend.cfg b/tests/cfg/guest_suspend.cfg
index ea16b307a8beb8123d36003c85fe6abc2b30f9d6..b5faf80c308b4d9bfa7bf47c9dec152a43ff0878 100644
--- a/tests/cfg/guest_suspend.cfg
+++ b/tests/cfg/guest_suspend.cfg
@@ -44,7 +44,7 @@
             type = clock_getres
             sub_test = guest_suspend
         - without_kvmclock:
-            cpu_model_flags += " -kvmclock"
+            cpu_model_flags += ",-kvmclock"
     variants:
         - guest_s3:
             guest_suspend_type = "mem"
diff --git a/tests/cfg/whql.cfg b/tests/cfg/whql.cfg
index af3b7c18abde9f85d2f7f62d161794c45a935321..87ab96f059ed5f09e266257b8432809dfc224cae 100644
--- a/tests/cfg/whql.cfg
+++ b/tests/cfg/whql.cfg
@@ -203,6 +203,7 @@
                 - block_device:
                     image_snapshot = yes
                     images += " stg stg2 stg3 stg4"
+                    image_extra_params = ""
                     image_format_stg = raw
                     image_name_stg = images/storage
                     image_size_stg = 2G