diff --git a/qemu/tests/cfg/qmp_event_notification.cfg b/qemu/tests/cfg/qmp_event_notification.cfg
index c6ad9766fc7b1369ef869511631b4a253cb32785..25c82da4d99dec72dacbcbe6480438d9fbadd831 100644
--- a/qemu/tests/cfg/qmp_event_notification.cfg
+++ b/qemu/tests/cfg/qmp_event_notification.cfg
@@ -9,38 +9,48 @@
     main_monitor = hmp1
     monitor_type = human
     monitor_type_qmp2 = qmp
+    variants:
+        - from_guest:
+            only qmp_system_reset qmp_system_powerdown qmp_rtc_change qmp_watchdog
+            event_cmd_type = guest_cmd
+        - from_qmp:
+            only qmp_quit qmp_system_reset qmp_system_powerdown
+            event_cmd_type = qmp_cmd
+        - from_hmp:
+            only qmp_stop qmp_resume
+            event_cmd_type = monitor_cmd
     variants:
         - qmp_quit:
             event_cmd = quit
-            event_cmd_type = qmp_cmd
             event_check = "SHUTDOWN"
         - qmp_system_reset:
-            event_cmd = system_reset
-            event_cmd_type = qmp_cmd
             event_check = "RESET"
+            from_guest:
+                event_cmd = reboot
+            from_qmp:
+                event_cmd = system_reset
         - qmp_system_powerdown:
-            event_cmd = system_powerdown
-            event_cmd_type = qmp_cmd
-            event_check = "POWERDOWN"
+            from_guest:
+                event_check = "SHUTDOWN"
+                event_cmd = shutdown -h now
+            from_qmp:
+                event_check = "POWERDOWN"
+                event_cmd = system_powerdown
         - qmp_stop:
             event_cmd = stop
             post_event_cmd = c
-            event_cmd_type = monitor_cmd
             event_check = "STOP"
         - qmp_resume:
             pre_event_cmd = stop
             event_cmd = c
-            event_cmd_type = monitor_cmd
             event_check = "RESUME"
         - qmp_rtc_change:
             no Windows
             event_cmd = hwclock --systohc
-            event_cmd_type = guest_cmd
             event_check = "RTC_CHANGE"
         - qmp_watchdog:
             no Windows
             event_cmd = echo 0 > /dev/watchdog
-            event_cmd_type = guest_cmd
             event_check = "WATCHDOG"
             variants:
                 - qmp_pause: