diff --git a/generic/tests/cfg/kdump.cfg b/generic/tests/cfg/kdump.cfg
index fb6e8a5f9c0a91fb61f88471ff92d465a7ccbe07..3dee7d40a5850131ca9f8e8fb2ed8f599abbb291 100644
--- a/generic/tests/cfg/kdump.cfg
+++ b/generic/tests/cfg/kdump.cfg
@@ -48,12 +48,13 @@
                     #netperf server is guest, the netperf client is host
                     wait_bg_time = 60
                     run_bgstress = netperf_stress
-                    hostpasswd = redhat
-                    netperf_download_link = ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.bz2
-                    pkg_md5sum = 9654ffdfd4c4f2c93ce3733cd9ed9236
-                    server_path = /var/tmp/netperf-2.6.0.tar.bz2
-                    client_path = /var/tmp/netperf-2.6.0.tar.bz2
-                    netperf_test_timeout = 360
+                    hostpassword = redhat
+                    netperf_client = ${vms}
+                    netperf_server = localhost
+                    netperf_link = netperf-2.6.0.tar.bz2
+                    server_path = /var/tmp/
+                    client_path = /var/tmp/
+                    netperf_test_duration = 360
                     netperf_para_sessions = 2
                     test_protocol = TCP_STREAM
                     check_cmd = "pidof netserver"
diff --git a/generic/tests/cfg/multi_queues_test.cfg b/generic/tests/cfg/multi_queues_test.cfg
index 28b0380cd4e416d7af2be1d03f92321265b0909e..2cf549ed8d048ba0a2c1676eed902cc2acb282d9 100644
--- a/generic/tests/cfg/multi_queues_test.cfg
+++ b/generic/tests/cfg/multi_queues_test.cfg
@@ -13,23 +13,23 @@
     instance = 2
     variants:
         - with_netperf:
-            #Set "vm_as_server = no", main vm as a netperf client
-            vm_as_server = no
+            hostpassword = redhat 
+            netperf_link = netperf-2.6.0.tar.bz2
+            server_path = /var/tmp/
+            client_path = /var/tmp/
+            netperf_test_duration = 360
+            netperf_client = ${vms}
+            netperf_server = localhost
             wait_bg_time = 60
             bg_sub_test = netperf_stress
             bg_stress_run_flag = netperf_run
-            hostpasswd = redhat
-            netperf_download_link = ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.bz2
-            server_path = /tmp/netperf-2.6.0.tar.bz2
-            client_path = /tmp/netperf-2.6.0.tar.bz2
-            pkg_md5sum = 9654ffdfd4c4f2c93ce3733cd9ed9236
-            netperf_test_timeout = 360
             netperf_para_sessions = 2
             test_protocol = TCP_STREAM
             Windows:
-                server_download_link = "c:\\netserver-2.6.0.exe"
-                server_md5sum = 8f107e9df4f501d20cf46cccc426f4a9
-                server_path = "c:\\netserver.exe"
+                netperf_server_link_win = "netserver-2.6.0.exe"
+                netperf_client_link_win = "netperf.exe"
+                server_path_win = "c:\\"
+                client_path_win = "c:\\"
             variants:
                 - smp1:
                     smp = 1
diff --git a/qemu/tests/cfg/suspend_under_netperf.cfg b/qemu/tests/cfg/suspend_under_netperf.cfg
index a19df5e09fa4e7c57067b9f13602140639bf4139..b77600ff5af7575698d6004510633c09ee8ff1e7 100644
--- a/qemu/tests/cfg/suspend_under_netperf.cfg
+++ b/qemu/tests/cfg/suspend_under_netperf.cfg
@@ -4,28 +4,23 @@
     type = suspend_under_stress
     services_up_timeout = 30
     kill_vm_on_error = yes
-    variants:
-        - suspend_netperf_stress:
-            #netperf server is main vm, the netperf client is the host or another vm
-            wait_bg_time = 60
-            run_bgstress = netperf_stress
-            bg_stress_run_flag = netperf_run
-            hostpassword = redhat
-            netperf_client = ${vms}
-            netperf_server = localhost
-            netperf_link = netperf-2.6.0.tar.bz2
-            server_path = /var/tmp/
-            client_path = /var/tmp/
-            netperf_test_timeout = 360
-            netperf_para_sessions = 6
-            test_protocol = TCP_STREAM
-            Windows:
-                netperf_server_link_win = "netserver-2.6.0.exe"
-                netperf_client_link_win = "netperf.exe"
-                server_path_win = "c:\\"
-                client_path_win = "c:\\"
-
-
+    wait_bg_time = 60
+    run_bgstress = netperf_stress
+    bg_stress_run_flag = netperf_run
+    hostpassword = redhat
+    netperf_client = ${vms}
+    netperf_server = localhost
+    netperf_link = netperf-2.6.0.tar.bz2
+    server_path = /var/tmp/
+    client_path = /var/tmp/
+    netperf_test_timeout = 360
+    netperf_para_sessions = 6
+    test_protocol = TCP_STREAM
+    Windows:
+        netperf_server_link_win = "netserver-2.6.0.exe"
+        netperf_client_link_win = "netperf.exe"
+        server_path_win = "c:\\"
+        client_path_win = "c:\\"
     variants:
         - guest_s3:
             no Host_RHEL.5, Host_RHEL.6.0, Host_RHEL.6.1, Host_RHEL.6.2