diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf b/test/cfg2cmd/i440fx-win10-hostpci.conf
index b06079b9..0df13785 100644
--- a/test/cfg2cmd/i440fx-win10-hostpci.conf
+++ b/test/cfg2cmd/i440fx-win10-hostpci.conf
@@ -3,7 +3,7 @@ bios: ovmf
 bootdisk: scsi0
 cores: 1
 efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
-hostpci0: 00:12
+hostpci0: 0f:f2.0
 machine: pc
 memory: 512
 net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
index 43278111..ff5d635f 100644
--- a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
+++ b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
@@ -21,12 +21,12 @@
   -numa 'node,nodeid=0,cpus=0,memdev=ram-node0' \
   -object 'memory-backend-ram,id=ram-node1,size=256M' \
   -numa 'node,nodeid=1,cpus=1,memdev=ram-node1' \
-  -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \
   -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \
+  -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \
   -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \
   -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \
   -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \
-  -device 'vfio-pci,host=00:12.0,id=hostpci0,bus=pci.0,addr=0x10' \
+  -device 'vfio-pci,host=0f:f2.0,id=hostpci0,bus=pci.0,addr=0x10' \
   -device 'VGA,id=vga,bus=pci.0,addr=0x2' \
   -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \
   -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \
diff --git a/test/cfg2cmd/q35-linux-hostpci.conf b/test/cfg2cmd/q35-linux-hostpci.conf
index ff6c1c6c..48dc45de 100644
--- a/test/cfg2cmd/q35-linux-hostpci.conf
+++ b/test/cfg2cmd/q35-linux-hostpci.conf
@@ -3,9 +3,9 @@ bios: ovmf
 bootdisk: scsi0
 cores: 1
 efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
-hostpci0: 00:12
+hostpci0: 00:ff.1
 hostpci1: 00:13,pcie=1
-hostpci2: 00:14
+hostpci2: 00:f4.0
 hostpci3: 00:15,pcie=1
 hostpci4: 00:17,pcie=1,rombar=0
 hostpci7: 00:15,pcie=1
diff --git a/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/test/cfg2cmd/q35-linux-hostpci.conf.cmd
index 42988da4..0bc5a53e 100644
--- a/test/cfg2cmd/q35-linux-hostpci.conf.cmd
+++ b/test/cfg2cmd/q35-linux-hostpci.conf.cmd
@@ -23,7 +23,8 @@
   -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \
   -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \
   -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \
-  -device 'vfio-pci,host=00:12.0,id=hostpci0,bus=pci.0,addr=0x10' \
+  -device 'vfio-pci,host=00:ff.1,id=hostpci0,bus=pci.0,addr=0x10' \
+  -device 'vfio-pci,host=00:f4.0,id=hostpci2,bus=pci.0,addr=0x1b' \
   -device 'pcie-root-port,id=ich9-pcie-port-5,addr=10.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=5,chassis=5' \
   -device 'pcie-root-port,id=ich9-pcie-port-8,addr=10.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=8,chassis=8' \
   -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \
diff --git a/test/cfg2cmd/q35-win10-hostpci.conf b/test/cfg2cmd/q35-win10-hostpci.conf
index 4cb55851..346213bc 100644
--- a/test/cfg2cmd/q35-win10-hostpci.conf
+++ b/test/cfg2cmd/q35-win10-hostpci.conf
@@ -3,7 +3,7 @@ bios: ovmf
 bootdisk: scsi0
 cores: 1
 efidisk0: local:100/vm-100-disk-1.qcow2,size=128K
-hostpci0: 00:12
+hostpci0: f0:42.0
 hostpci1: 00:12,pcie=1
 hostpci4: 00:12,pcie=1
 machine: q35
diff --git a/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/test/cfg2cmd/q35-win10-hostpci.conf.cmd
index b4a1e076..5ea5a85b 100644
--- a/test/cfg2cmd/q35-win10-hostpci.conf.cmd
+++ b/test/cfg2cmd/q35-win10-hostpci.conf.cmd
@@ -24,7 +24,7 @@
   -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \
   -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \
   -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \
-  -device 'vfio-pci,host=00:12.0,id=hostpci0,bus=pci.0,addr=0x10' \
+  -device 'vfio-pci,host=f0:42.0,id=hostpci0,bus=pci.0,addr=0x10' \
   -device 'vfio-pci,host=00:12.0,id=hostpci1,bus=ich9-pcie-port-2,addr=0x0' \
   -device 'pcie-root-port,id=ich9-pcie-port-5,addr=10.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=5,chassis=5' \
   -device 'vfio-pci,host=00:12.0,id=hostpci4,bus=ich9-pcie-port-5,addr=0x0' \