diff --git a/generic/tests/multi_queues_test.py b/generic/tests/multi_queues_test.py
index b9969f6e6646adaa414dd149356266dd8deff06d..340b0ada11e1ce06dd2cb0c680882793ed02fb2a 100644
--- a/generic/tests/multi_queues_test.py
+++ b/generic/tests/multi_queues_test.py
@@ -67,7 +67,7 @@ def run(test, params, env):
         cmd = r"cat /proc/interrupts | sed -n '/^\s\+%s:/p'" % irq_number
         online_cpu_number = int(session.cmd_output_safe(online_cpu_number_cmd))
         irq_statics = session.cmd_output(cmd)
-        irq_statics_list = map(int, irq_statics.split()[1:online_cpu_number])
+        irq_statics_list = list(map(int, irq_statics.split()[1:online_cpu_number]))
         if irq_statics_list:
             if cpu_id and cpu_id < len(irq_statics_list):
                 return irq_statics_list[cpu_id]
@@ -177,8 +177,7 @@ def run(test, params, env):
                     irq_cur = get_cpu_irq_statistics(session, irq_number)
                     logging.info("After 10s, cpu irq info: %s" % irq_cur)
 
-                    irq_change_list = map(lambda x: x[0] - x[1],
-                                          zip(irq_cur, irq_ori))
+                    irq_change_list = [x[0] - x[1] for x in zip(irq_cur, irq_ori)]
                     cpu_affinity = irq_change_list.index(max(irq_change_list))
                     if cpu_affinity != int(taskset_cpu):
                         err_msg = "Error, taskset on cpu %s, "
diff --git a/generic/tests/shutdown.py b/generic/tests/shutdown.py
index 63cf8fbba3a09e3aa9298762a39b5a87b9effde2..26fef2ed77d5ed9dfb18bbebfd0cb83beb4b4016 100644
--- a/generic/tests/shutdown.py
+++ b/generic/tests/shutdown.py
@@ -27,7 +27,7 @@ def run(test, params, env):
     shutdown_command = params.get("shutdown_command")
     check_from_monitor = params.get("check_from_monitor", "no") == "yes"
 
-    for i in xrange(shutdown_count):
+    for i in range(shutdown_count):
         vm = env.get_vm(params["main_vm"])
         vm.verify_alive()
         session = vm.wait_for_login(timeout=timeout)