diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 8d77c0056a3e9cf111fdb1dbefc68092c699fa92..bdde7e45f34237ef8aebd8e20987bd52ee698874 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -828,6 +828,12 @@ mymain(void)
     DO_TEST_DETACH("base-live", "watchdog-full", false, false,
                    "device_del", QMP_OK);
 
+    DO_TEST_ATTACH("base-live", "watchdog-user-alias", false, true,
+                   "watchdog-set-action", QMP_OK,
+                   "device_add", QMP_OK);
+    DO_TEST_DETACH("base-live", "watchdog-user-alias-full", false, false,
+                   "device_del", QMP_OK);
+
 #define DO_TEST_CPU_GROUP(prefix, vcpus, modernhp, expectfail)                 \
     do {                                                                       \
         cpudata.test = prefix;                                                 \
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d34f24554641a23cf13f7e693fc88cc531adf1e9
--- /dev/null
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml
@@ -0,0 +1,4 @@
+<watchdog model='i6300esb' action='poweroff'>
+  <alias name='ua-UserWatchdog'/>
+  <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+</watchdog>
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias.xml b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0caff99e44627ee0405e0e5d2fdf0000b0c57660
--- /dev/null
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias.xml
@@ -0,0 +1,3 @@
+<watchdog model='i6300esb' action='poweroff'>
+  <alias name="ua-UserWatchdog"/>
+</watchdog>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
new file mode 100644
index 0000000000000000000000000000000000000000..27aff2b6f8db81294c0c193f67e098a05fe9d2ff
--- /dev/null
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
@@ -0,0 +1,56 @@
+<domain type='kvm' id='7'>
+  <name>hotplug</name>
+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' index='0'>
+      <alias name='usb'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <alias name='ide'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='scsi' index='0' model='virtio-scsi'>
+      <alias name='scsi0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'>
+      <alias name='pci'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <alias name='virtio-serial0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </controller>
+    <input type='mouse' bus='ps2'>
+      <alias name='input0'/>
+    </input>
+    <input type='keyboard' bus='ps2'>
+      <alias name='input1'/>
+    </input>
+    <watchdog model='i6300esb' action='poweroff'>
+      <alias name='ua-UserWatchdog'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </watchdog>
+    <memballoon model='none'>
+      <alias name='balloon0'/>
+    </memballoon>
+  </devices>
+  <seclabel type='none' model='none'/>
+</domain>