diff --git a/tests/qemuxml2argvdata/net-bandwidth.x86_64-latest.args b/tests/qemuxml2argvdata/net-bandwidth.x86_64-latest.args
new file mode 100644
index 0000000000..5dc47d316f
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-bandwidth.x86_64-latest.args
@@ -0,0 +1,47 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-f14-60 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=f14-60,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-f14-60/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
+-accel kvm \
+-cpu qemu64 \
+-m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-uuid 38644c45-5227-a936-3b38-bc4f72c355bb \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot menu=on,strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14-6.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \
+-blockdev '{"driver":"file","filename":"/home/zippy/tmp/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0","bootindex":1}' \
+-netdev '{"type":"tap","fd":"102","id":"hostnet0"}' \
+-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \
+-chardev pty,id=charserial0 \
+-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
+-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
+-device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr":"0x2"}' \
+-device '{"driver":"AC97","id":"sound0","audiodev":"audio1","bus":"pci.0","addr":"0x3"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-bandwidth.xml b/tests/qemuxml2argvdata/net-bandwidth.xml
index 3d43f1666b..f4a57d708d 100644
--- a/tests/qemuxml2argvdata/net-bandwidth.xml
+++ b/tests/qemuxml2argvdata/net-bandwidth.xml
@@ -44,7 +44,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:24:a5:9f'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <bandwidth>
         <inbound average='1000' peak='4000' burst='1024'/>
         <outbound average='128' peak='256' burst='32768'/>
diff --git a/tests/qemuxml2argvdata/net-bandwidth2.x86_64-latest.args b/tests/qemuxml2argvdata/net-bandwidth2.x86_64-latest.args
new file mode 100644
index 0000000000..f3a6b80ec3
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-bandwidth2.x86_64-latest.args
@@ -0,0 +1,44 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-f14-60 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=f14-60,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-f14-60/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
+-accel kvm \
+-cpu qemu64 \
+-m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-uuid 38644c45-5227-a936-3b38-bc4f72c355bb \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot menu=on,strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14-6.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":2}' \
+-netdev '{"type":"tap","fd":"102","id":"hostnet0"}' \
+-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \
+-chardev pty,id=charserial0 \
+-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
+-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
+-device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr":"0x2"}' \
+-device '{"driver":"AC97","id":"sound0","audiodev":"audio1","bus":"pci.0","addr":"0x3"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-bandwidth2.xml b/tests/qemuxml2argvdata/net-bandwidth2.xml
index b75e17da16..c9fdefc300 100644
--- a/tests/qemuxml2argvdata/net-bandwidth2.xml
+++ b/tests/qemuxml2argvdata/net-bandwidth2.xml
@@ -34,7 +34,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:24:a5:9f'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <bandwidth>
         <inbound floor='200'/>
       </bandwidth>
diff --git a/tests/qemuxml2argvdata/net-coalesce.x86_64-latest.args b/tests/qemuxml2argvdata/net-coalesce.x86_64-latest.args
new file mode 100644
index 0000000000..6fe8226630
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-coalesce.x86_64-latest.args
@@ -0,0 +1,48 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 15d091de-0181-456b-9554-e4382dc1f1ab \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot menu=on,strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}' \
+-device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0","bootindex":1}' \
+-netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostnet0"}' \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \
+-netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostnet1"}' \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \
+-netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostnet2"}' \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":"52:54:00:e5:48:60","bus":"pci.0","addr":"0x5"}' \
+-chardev pty,id=charserial0 \
+-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x7"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-coalesce.xml b/tests/qemuxml2argvdata/net-coalesce.xml
index 6fa3641e7d..ec3323e4e6 100644
--- a/tests/qemuxml2argvdata/net-coalesce.xml
+++ b/tests/qemuxml2argvdata/net-coalesce.xml
@@ -36,7 +36,7 @@
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <mac address='52:54:00:e5:48:58'/>
       <model type='virtio'/>
       <coalesce>
@@ -46,7 +46,7 @@
       </coalesce>
     </interface>
     <interface type='network'>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <mac address='52:54:00:e5:48:59'/>
       <model type='virtio'/>
       <coalesce>
@@ -56,7 +56,7 @@
       </coalesce>
     </interface>
     <interface type='network'>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <mac address='52:54:00:e5:48:60'/>
       <model type='virtio'/>
       <coalesce>
diff --git a/tests/qemuxml2argvdata/net-isolated-port.x86_64-latest.args b/tests/qemuxml2argvdata/net-isolated-port.x86_64-latest.args
new file mode 100644
index 0000000000..43d17a4766
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-isolated-port.x86_64-latest.args
@@ -0,0 +1,43 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-q35-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=q35-test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-q35-test/master-key.aes"}' \
+-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=2097152k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \
+-device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x2.0x1"}' \
+-device '{"driver":"pcie-root-port","port":18,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x2.0x2"}' \
+-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-format","id":"sata0-0-0","bootindex":1}' \
+-netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostnet0"}' \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:d6:c0:0b","bus":"pci.1","addr":"0x0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \
+-global ICH9-LPC.noreboot=off \
+-watchdog-action reset \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-isolated-port.xml b/tests/qemuxml2argvdata/net-isolated-port.xml
index 122378a8f0..a1e341b826 100644
--- a/tests/qemuxml2argvdata/net-isolated-port.xml
+++ b/tests/qemuxml2argvdata/net-isolated-port.xml
@@ -22,7 +22,7 @@
     <controller type='pci' index='0' model='pcie-root'/>
     <interface type='network'>
       <mac address='52:54:00:d6:c0:0b'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <port isolated='yes'/>
       <model type='virtio'/>
     </interface>
diff --git a/tests/qemuxml2argvdata/net-mtu.x86_64-latest.args b/tests/qemuxml2argvdata/net-mtu.x86_64-latest.args
new file mode 100644
index 0000000000..2b97106080
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-mtu.x86_64-latest.args
@@ -0,0 +1,46 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 15d091de-0181-456b-9554-e4382dc1f1ab \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot menu=on,strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}' \
+-device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0","bootindex":1}' \
+-netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostnet0"}' \
+-device '{"driver":"virtio-net-pci","host_mtu":1500,"netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \
+-netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","sndbuf":1600,"id":"hostnet1"}' \
+-device '{"driver":"virtio-net-pci","host_mtu":9000,"netdev":"hostnet1","id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \
+-chardev pty,id=charserial0 \
+-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-mtu.xml b/tests/qemuxml2argvdata/net-mtu.xml
index 04fa1a2686..28dff26966 100644
--- a/tests/qemuxml2argvdata/net-mtu.xml
+++ b/tests/qemuxml2argvdata/net-mtu.xml
@@ -44,14 +44,14 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='virtio'/>
       <mtu size='1500'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </interface>
     <interface type='network'>
       <mac address='52:54:00:e5:48:59'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='virtio'/>
       <tune>
         <sndbuf>1600</sndbuf>
diff --git a/tests/qemuxml2argvdata/net-openvswitch.x86_64-latest.args b/tests/qemuxml2argvdata/net-openvswitch.x86_64-latest.args
new file mode 100644
index 0000000000..48c2f7b2e8
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-openvswitch.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-netdev '{"type":"tap","fd":"102","id":"hostnet0"}' \
+-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-openvswitch.xml b/tests/qemuxml2argvdata/net-openvswitch.xml
index c8b64be4a0..31792a157b 100644
--- a/tests/qemuxml2argvdata/net-openvswitch.xml
+++ b/tests/qemuxml2argvdata/net-openvswitch.xml
@@ -24,7 +24,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='00:11:22:33:44:55'/>
-      <source network='ovs-net'/>
+      <source network='openvswitch-net;plug-bridge-basic'/>
       <vlan trunk='yes'>
         <tag id='42'/>
         <tag id='48'/>
diff --git a/tests/qemuxml2argvdata/net-virtio-network-portgroup.x86_64-latest.args b/tests/qemuxml2argvdata/net-virtio-network-portgroup.x86_64-latest.args
new file mode 100644
index 0000000000..294af60b77
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-virtio-network-portgroup.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostnet0"}' \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \
+-netdev '{"type":"tap","fd":"102","id":"hostnet1"}' \
+-device '{"driver":"rtl8139","netdev":"hostnet1","id":"net1","mac":"10:11:22:33:44:55","bus":"pci.0","addr":"0x3"}' \
+-netdev '{"type":"tap","fd":"102","id":"hostnet2"}' \
+-device '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"22:11:22:33:44:55","bus":"pci.0","addr":"0x4"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
index 81b4aa8555..0e79fe648f 100644
--- a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml
@@ -24,7 +24,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network' trustGuestRxFilters='yes'>
       <mac address='00:11:22:33:44:55'/>
-      <source network='rednet' portgroup='bob' portid='873be5a0-6b8a-4a0b-a1df-ef3659cd64bc'/>
+      <source network='vepa-net;plug-bridge-basic' portgroup='bob' portid='873be5a0-6b8a-4a0b-a1df-ef3659cd64bc'/>
       <vlan>
         <tag id='4095'/>
       </vlan>
@@ -35,7 +35,7 @@
     </interface>
     <interface type='network' trustGuestRxFilters='no'>
       <mac address='10:11:22:33:44:55'/>
-      <source network='blue' portgroup='sam' portid='b884cc7e-b347-4a17-9e78-4f672a67794e'/>
+      <source network='vepa-net;plug-bridge-basic' portgroup='sam' portid='b884cc7e-b347-4a17-9e78-4f672a67794e'/>
       <virtualport>
         <parameters instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f' interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
       </virtualport>
@@ -43,7 +43,7 @@
     </interface>
     <interface type='network'>
       <mac address='22:11:22:33:44:55'/>
-      <source network='blue' portgroup='sam' portid='c5fc8eb4-cb69-4fea-8f8b-65e00e6d1dba'/>
+      <source network='vepa-net;plug-bridge-basic' portgroup='sam' portid='c5fc8eb4-cb69-4fea-8f8b-65e00e6d1dba'/>
       <virtualport type='802.1Qbh'>
         <parameters profileid='testhis99'/>
       </virtualport>
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-network.x86_64-latest.args b/tests/qemuxml2argvdata/net-virtio-teaming-network.x86_64-latest.args
new file mode 100644
index 0000000000..b18341d7e4
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-network.x86_64-latest.args
@@ -0,0 +1,39 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostua-backup0"}' \
+-device '{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backup0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"vfio-pci","host":"0001:02:03.4","id":"hostdev0","failover_pair_id":"ua-backup0","bus":"pci.0","addr":"0x3"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-network.xml b/tests/qemuxml2argvdata/net-virtio-teaming-network.xml
index 04638cfeda..89319855cf 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-network.xml
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-network.xml
@@ -21,14 +21,14 @@
     <controller type='usb' index='0'/>
     <interface type='network'>
       <mac address='00:11:22:33:44:55'/>
-      <source network='mybridge'/>
+      <source network='nat-network;plug-bridge-basic'/>
       <model type='virtio'/>
       <teaming type='persistent'/>
       <alias name='ua-backup0'/>
     </interface>
     <interface type='network'>
       <mac address='00:11:22:33:44:55'/>
-      <source network='myhostdevpool'/>
+      <source network='hostdev;plug-hostdev-pci'/>
       <model type='virtio'/>
       <teaming type='transient' persistent='ua-backup0'/>
     </interface>
diff --git a/tests/qemuxml2argvdata/tap-vhost-incorrect.x86_64-latest.args b/tests/qemuxml2argvdata/tap-vhost-incorrect.x86_64-latest.args
new file mode 100644
index 0000000000..f43f75d709
--- /dev/null
+++ b/tests/qemuxml2argvdata/tap-vhost-incorrect.x86_64-latest.args
@@ -0,0 +1,40 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot menu=on,strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}' \
+-netdev '{"type":"tap","fd":"102","id":"hostnet0"}' \
+-device '{"driver":"e1000","netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \
+-netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostnet1"}' \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \
+-chardev pty,id=charserial0 \
+-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/tap-vhost-incorrect.xml b/tests/qemuxml2argvdata/tap-vhost-incorrect.xml
index 084ddae346..6af89f7f7a 100644
--- a/tests/qemuxml2argvdata/tap-vhost-incorrect.xml
+++ b/tests/qemuxml2argvdata/tap-vhost-incorrect.xml
@@ -24,14 +24,14 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='e1000'/>
       <driver name='vhost' queues='5'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
     </interface>
     <interface type='network'>
       <mac address='52:54:00:e5:48:59'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='virtio'/>
       <driver name='vhost' queues='1'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
diff --git a/tests/qemuxml2argvdata/tap-vhost.x86_64-latest.args b/tests/qemuxml2argvdata/tap-vhost.x86_64-latest.args
new file mode 100644
index 0000000000..5fc5a5cda3
--- /dev/null
+++ b/tests/qemuxml2argvdata/tap-vhost.x86_64-latest.args
@@ -0,0 +1,44 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot menu=on,strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}' \
+-device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0","bootindex":1}' \
+-netdev '{"type":"tap","fds":"102:103:104:105:106","vhost":true,"vhostfds":"44:45:46:47:48","id":"hostnet0"}' \
+-device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \
+-chardev pty,id=charserial0 \
+-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/tap-vhost.xml b/tests/qemuxml2argvdata/tap-vhost.xml
index 0e2e7ddf21..02f8f2be70 100644
--- a/tests/qemuxml2argvdata/tap-vhost.xml
+++ b/tests/qemuxml2argvdata/tap-vhost.xml
@@ -37,7 +37,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='virtio'/>
       <driver name='vhost' queues='5'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 7313dec792..fbb363dcae 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2584,6 +2584,16 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw-auto", "s390x");
 
     DO_TEST_CAPS_LATEST("graphics-listen-network");
+    DO_TEST_CAPS_LATEST("net-bandwidth");
+    DO_TEST_CAPS_LATEST("net-bandwidth2");
+    DO_TEST_CAPS_LATEST("net-coalesce");
+    DO_TEST_CAPS_LATEST("net-isolated-port");
+    DO_TEST_CAPS_LATEST("net-mtu");
+    DO_TEST_CAPS_LATEST("net-openvswitch");
+    DO_TEST_CAPS_LATEST("net-virtio-network-portgroup");
+    DO_TEST_CAPS_LATEST("net-virtio-teaming-network");
+    DO_TEST_CAPS_LATEST("tap-vhost-incorrect");
+    DO_TEST_CAPS_LATEST("tap-vhost");
 
     qemuTestDriverFree(&driver);
     virFileWrapperClearPrefixes();
diff --git a/tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml
index 7d634d8940..2ac89e20ad 100644
--- a/tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml
@@ -49,7 +49,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:24:a5:9f'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <bandwidth>
         <inbound average='1000' peak='4000' burst='1024'/>
         <outbound average='128' peak='256' burst='32768'/>
diff --git a/tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml
index 9ec0172dfc..272ad8695c 100644
--- a/tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml
@@ -39,7 +39,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:24:a5:9f'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <bandwidth>
         <inbound floor='200'/>
       </bandwidth>
diff --git a/tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
index c99ba6c6e5..93f475407d 100644
--- a/tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-coalesce.x86_64-latest.xml
@@ -44,7 +44,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='virtio'/>
       <coalesce>
         <rx>
@@ -55,13 +55,13 @@
     </interface>
     <interface type='network'>
       <mac address='52:54:00:e5:48:59'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </interface>
     <interface type='network'>
       <mac address='52:54:00:e5:48:60'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </interface>
diff --git a/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
index c3dca579a6..cb3f7dbab6 100644
--- a/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
@@ -47,7 +47,7 @@
     </controller>
     <interface type='network'>
       <mac address='52:54:00:d6:c0:0b'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <port isolated='yes'/>
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
index 1512b118a5..cc565e0a04 100644
--- a/tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-openvswitch.x86_64-latest.xml
@@ -32,7 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='00:11:22:33:44:55'/>
-      <source network='ovs-net'/>
+      <source network='openvswitch-net;plug-bridge-basic'/>
       <vlan trunk='yes'>
         <tag id='42'/>
         <tag id='48'/>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
index 43c10ffc60..1f712b3ed3 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.x86_64-latest.xml
@@ -32,7 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network' trustGuestRxFilters='yes'>
       <mac address='00:11:22:33:44:55'/>
-      <source network='rednet' portgroup='bob'/>
+      <source network='vepa-net;plug-bridge-basic' portgroup='bob'/>
       <vlan>
         <tag id='4095'/>
       </vlan>
@@ -44,7 +44,7 @@
     </interface>
     <interface type='network' trustGuestRxFilters='no'>
       <mac address='10:11:22:33:44:55'/>
-      <source network='blue' portgroup='sam'/>
+      <source network='vepa-net;plug-bridge-basic' portgroup='sam'/>
       <virtualport>
         <parameters instanceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f' interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
       </virtualport>
@@ -53,7 +53,7 @@
     </interface>
     <interface type='network'>
       <mac address='22:11:22:33:44:55'/>
-      <source network='blue' portgroup='sam'/>
+      <source network='vepa-net;plug-bridge-basic' portgroup='sam'/>
       <virtualport type='802.1Qbh'>
         <parameters profileid='testhis99'/>
       </virtualport>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml
index dcb2339035..184f18e4dc 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml
@@ -32,7 +32,7 @@
     </controller>
     <interface type='network'>
       <mac address='00:11:22:33:44:55'/>
-      <source network='mybridge'/>
+      <source network='nat-network;plug-bridge-basic'/>
       <model type='virtio'/>
       <teaming type='persistent'/>
       <alias name='ua-backup0'/>
@@ -40,7 +40,7 @@
     </interface>
     <interface type='network'>
       <mac address='00:11:22:33:44:55'/>
-      <source network='myhostdevpool'/>
+      <source network='hostdev;plug-hostdev-pci'/>
       <model type='virtio'/>
       <teaming type='transient' persistent='ua-backup0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
index 803136669b..bd47fd0a50 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.x86_64-latest.xml
@@ -31,14 +31,14 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='e1000'/>
       <backend tap='/dev/null'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </interface>
     <interface type='network'>
       <mac address='52:54:00:e5:48:59'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='virtio'/>
       <driver name='vhost'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
index e4f38179ce..f5ac160dd9 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost.x86_64-latest.xml
@@ -44,7 +44,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <mac address='52:54:00:e5:48:58'/>
-      <source network='default'/>
+      <source network='nat-network;plug-network-basic'/>
       <model type='virtio'/>
       <driver name='vhost' queues='5'/>
       <backend tap='/dev/null' vhost='/dev/zero'/>