diff --git a/qemu/tests/cfg/qmp_command.cfg b/qemu/tests/cfg/qmp_command.cfg
index 953ac53c737a0bbff2a54738379c7bbaa06148bd..c31f8a1392bdc5814935c672364d01037d558bef 100644
--- a/qemu/tests/cfg/qmp_command.cfg
+++ b/qemu/tests/cfg/qmp_command.cfg
@@ -31,12 +31,11 @@
             cmd_return_value = "{u'status': u'paused', u'singlestep': False, u'running': False}"
         - qmp_query-name:
             qmp_cmd = "query-name"
-            post_cmd = "info name"
-            cmd_result_check = m_in_q
+            cmd_result_check = contain 
         - qmp_query-uuid:
+            uuid = 990ea161-6b67-47b2-b803-19fb01d30d12 
             qmp_cmd = "query-uuid"
-            post_cmd = "info uuid"
-            cmd_result_check = m_in_q
+            cmd_result_check = contain
         - qmp_query-version:
             qmp_cmd = query-version
             cmd_result_check = m_equal_q
@@ -147,8 +146,8 @@
             negative_test = yes
         - qmp_human-monitor-command:
             qmp_cmd = human-monitor-command command-line=info kvm
-            post_cmd = info kvm
-            cmd_result_check = m_in_q
+            cmd_result_check = contain
+            cmd_return_value = "kvm support: enabled"
         - qmp__com.redhat.drive_del:
             only Host_RHEL.m6
             pre_command += "qemu-img create -f qcow2 /tmp/__com.redhat.drive_del01.qcow2 100M"
diff --git a/qemu/tests/qmp_command.py b/qemu/tests/qmp_command.py
index 9f693f2006a08a1bc038354fa06b6cc6ccd2a44a..12756940e31b45c810bf46d3fd5ea7107e9ac46f 100644
--- a/qemu/tests/qmp_command.py
+++ b/qemu/tests/qmp_command.py
@@ -266,7 +266,14 @@ def run(test, params, env):
         txt = "Verify that qmp command '%s' works as designed." % qmp_cmd
         logging.info(txt)
         if result_check == "equal" or result_check == "contain":
-            check_result(output, cmd_return_value, exception_list)
+            if qmp_cmd == "query-name":
+                vm_name = params["main_vm"]
+                check_result(output, vm_name, exception_list)
+            elif qmp_cmd == "query-uuid":
+                uuid_input = params["uuid"]
+                check_result(output, uuid_input, exception_list)
+            else:
+                check_result(output, cmd_return_value, exception_list)
         elif result_check == "m_format_q":
             check_result(output, cmd_return_value, exception_list)
         elif 'post' in result_check: