diff --git a/qemu/tests/cfg/block_commit.cfg b/qemu/tests/cfg/block_commit.cfg
index b43fd07229bf7fd3df40efc39944982f808d5189..80b78413cd2d9917792d6af66801389253297b22 100644
--- a/qemu/tests/cfg/block_commit.cfg
+++ b/qemu/tests/cfg/block_commit.cfg
@@ -18,6 +18,18 @@
     base_image = "images/sn1"
     top_image = "images/sn3"
     expected_image_file = "images/sn1"
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - with_payload:
             type = block_commit_stress
diff --git a/qemu/tests/cfg/block_stream.cfg b/qemu/tests/cfg/block_stream.cfg
index 0a0f5118c363ca3b7905127266ab0330e56d4c14..7e45ee9ffbd6540910b7c5a3a81cf1c9ef69f3f4 100644
--- a/qemu/tests/cfg/block_stream.cfg
+++ b/qemu/tests/cfg/block_stream.cfg
@@ -21,6 +21,18 @@
     kill_vm = yes
     alive_check_cmd = dir
     tmp_dir = /tmp
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - simple_test:
             type = block_stream_simple
@@ -89,15 +101,6 @@
             after_finished = "unload_stress reboot verify_alive"
             variants:
                 - @default:
-                - data_plane:
-                    only Host_RHEL.m7
-                    only virtio_blk virtio_scsi
-                    iothreads = iothread0
-                    virtio_blk:
-                        blk_extra_params_image1 = "iothread=${iothreads}"
-                    virtio_scsi:
-                        no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
-                        bus_extra_params_image1 = "iothread=${iothreads}"
                 - cancel_async:
                     wait_finished = no
                     cancel_timeout_image1 = 3
diff --git a/qemu/tests/cfg/block_stream_negative.cfg b/qemu/tests/cfg/block_stream_negative.cfg
index 2d7713058c23374a072d0c51ac7eda4ec1b0a7ec..672c679bb957a9f5a64dae40ec2e3bdbbcbc9644 100644
--- a/qemu/tests/cfg/block_stream_negative.cfg
+++ b/qemu/tests/cfg/block_stream_negative.cfg
@@ -16,6 +16,18 @@
     kill_vm = yes
     alive_check_cmd = dir
     tmp_dir = /tmp
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - simple_test:
             type = block_stream_negative
diff --git a/qemu/tests/cfg/drive_mirror.cfg b/qemu/tests/cfg/drive_mirror.cfg
index cb17a7e9d0c2f3f1bdae57ddafcd3807759180d0..074eedbd9dd269e356313113ecb09d56e4432286 100644
--- a/qemu/tests/cfg/drive_mirror.cfg
+++ b/qemu/tests/cfg/drive_mirror.cfg
@@ -34,6 +34,18 @@
     repeat_times = 3
     cancel_timeout = 5
     #For drive_mirror_complete, target image will not be boot by default, as boot_target_image=no
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - 2qcow2:
             image_format_target = "qcow2"
diff --git a/qemu/tests/cfg/drive_mirror_negative_tests.cfg b/qemu/tests/cfg/drive_mirror_negative_tests.cfg
index adcb31d1c88cb64a40326674d380aa601d1a0410..4eb180a44cd055511bea720f3a48100705eed58e 100644
--- a/qemu/tests/cfg/drive_mirror_negative_tests.cfg
+++ b/qemu/tests/cfg/drive_mirror_negative_tests.cfg
@@ -32,6 +32,18 @@
     repeat_times = 3
     cancel_timeout = 5
     negative_test = yes
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - 2qcow2:
             image_format_target = "qcow2"
diff --git a/qemu/tests/cfg/live_backup.cfg b/qemu/tests/cfg/live_backup.cfg
index 5398ac0ddb38e9f065314a292f41f7daf6853a08..97e63e805c6c1e8ff23e125279d526b78fdea13d 100644
--- a/qemu/tests/cfg/live_backup.cfg
+++ b/qemu/tests/cfg/live_backup.cfg
@@ -18,6 +18,18 @@
     before_incremental = "stop"
     after_incremental = "verify_job_info reopen"
     check_params = ""
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - @default:
             before_full_backup = "create_files reboot stop"
@@ -43,12 +55,3 @@
                     granularity = 32768
                 - 131072:
                     granularity = 131072
-        - with_data_plane:
-            only Host_RHEL.m7
-            only virtio_blk virtio_scsi
-            iothreads = iothread0
-            virtio_blk:
-                blk_extra_params_image1 = "iothread=iothread0"
-            virtio_scsi:
-                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
-                bus_extra_params_image1 = "iothread=iothread0"
diff --git a/qemu/tests/cfg/live_snapshot.cfg b/qemu/tests/cfg/live_snapshot.cfg
index 5281a1777ff350807a5fa30568073abe90b81456..27b73853caa2150e849703a6166c060a91f86ab1 100644
--- a/qemu/tests/cfg/live_snapshot.cfg
+++ b/qemu/tests/cfg/live_snapshot.cfg
@@ -13,6 +13,18 @@
     create_cmd = "dd if=/dev/urandom of=%s bs=1M count=1024"
     file_create = /var/tmp/file
     clean_cmd = rm -f
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - simple_test:
             type = live_snapshot_simple
@@ -127,3 +139,10 @@
             force_create_image = yes
             force_create_image_image1 = no
             after_finished = "reboot verify_alive"
+            with_data_plane:
+                virtio_blk:
+                    blk_extra_params_sn1 = "iothread=iothread0"
+                    blk_extra_params_sn2 = "iothread=iothread1"
+                virtio_scsi:
+                    bus_extra_params_sn1 = "iothread=iothread0"
+                    bus_extra_params_sn2 = "iothread=iothread1"
diff --git a/qemu/tests/cfg/live_snapshot_chain.cfg b/qemu/tests/cfg/live_snapshot_chain.cfg
index 641af047c23a81b4dfb6fe76ecdc101413631457..2395316710908a997ebfac8d559d9c5d9427452b 100644
--- a/qemu/tests/cfg/live_snapshot_chain.cfg
+++ b/qemu/tests/cfg/live_snapshot_chain.cfg
@@ -14,6 +14,18 @@
     check_alive_cmd = "ls"
     kill_vm = yes
     remove_snapshot_images = yes
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - pause:
             file_create =
diff --git a/qemu/tests/cfg/live_snapshot_negative.cfg b/qemu/tests/cfg/live_snapshot_negative.cfg
index 677c7a7cfe4a28fb6d9fac8a32ba58e39f9e9a53..2c5c11b78e7ef775a28985de9310ae388b99a4ec 100644
--- a/qemu/tests/cfg/live_snapshot_negative.cfg
+++ b/qemu/tests/cfg/live_snapshot_negative.cfg
@@ -11,6 +11,18 @@
     create_cmd = "dd if=/dev/urandom of=%s bs=1M count=1024"
     file_create = /var/tmp/file
     clean_cmd = rm -f
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - simple_test:
             type = live_snapshot_negative