diff --git a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-active.x86_64-latest.xml b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-active.x86_64-latest.xml
index fec48e863b..5134818243 100644
--- a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-active.x86_64-latest.xml
+++ b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-active.x86_64-latest.xml
@@ -19,7 +19,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source protocol='gluster' name='Volume2/Image' index='2'>
+      <source protocol='nbd' name='Volume2/Image' index='2'>
         <host transport='unix' socket='/path/to/sock'/>
       </source>
       <backingStore type='file' index='1'>
@@ -68,7 +68,7 @@
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
-      <source protocol='gluster' name='Volume1/Image' index='10'>
+      <source protocol='nbd' name='Volume1/Image' index='10'>
         <host name='example.org' port='6000'/>
       </source>
       <backingStore/>
diff --git a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-inactive.x86_64-latest.xml b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-inactive.x86_64-latest.xml
index 52c8ad6f29..ef4fa48366 100644
--- a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-inactive.x86_64-latest.xml
+++ b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-inactive.x86_64-latest.xml
@@ -19,7 +19,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source protocol='gluster' name='Volume2/Image' index='2'>
+      <source protocol='nbd' name='Volume2/Image' index='2'>
         <host transport='unix' socket='/path/to/sock'/>
       </source>
       <backingStore type='file' index='1'>
@@ -68,7 +68,7 @@
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
-      <source protocol='gluster' name='Volume1/Image' index='10'>
+      <source protocol='nbd' name='Volume1/Image' index='10'>
         <host name='example.org' port='6000'/>
       </source>
       <backingStore/>
diff --git a/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.xml
index ad81cd4696..7d9405b6a8 100644
--- a/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.xml
@@ -19,7 +19,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source protocol='gluster' name='Volume2/Image'>
+      <source protocol='nbd' name='Volume2/Image'>
         <host transport='unix' socket='/path/to/sock'/>
       </source>
       <backingStore type='file'>
@@ -68,7 +68,7 @@
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
-      <source protocol='gluster' name='Volume1/Image'>
+      <source protocol='nbd' name='Volume1/Image'>
         <host name='example.org' port='6000'/>
       </source>
       <backingStore/>
diff --git a/tests/qemuxmlconfdata/disk-backing-chains-index.xml b/tests/qemuxmlconfdata/disk-backing-chains-index.xml
index 90da6a97e9..bf2104b477 100644
--- a/tests/qemuxmlconfdata/disk-backing-chains-index.xml
+++ b/tests/qemuxmlconfdata/disk-backing-chains-index.xml
@@ -16,7 +16,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source protocol='gluster' name='Volume2/Image' index='2'>
+      <source protocol='nbd' name='Volume2/Image' index='2'>
         <host transport='unix' socket='/path/to/sock'/>
       </source>
       <backingStore type='file' index='1'>
@@ -65,7 +65,7 @@
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <backingStore/>
-      <source protocol='gluster' name='Volume1/Image' index='10'>
+      <source protocol='nbd' name='Volume1/Image' index='10'>
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vdc' bus='virtio'/>
diff --git a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args
index 59b7843796..a5c71cc146 100644
--- a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -blockdev '{"driver":"file","filename":"/tmp/missing-backing-store.qcow","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-25-format","read-only":true,"driver":"qcow2","file":"libvirt-25-storage"}' \
--blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":[{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/path/to/sock"},"export":"Volume2/Image","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"qcow2","file":"libvirt-24-storage","backing":"libvirt-25-format"}' \
 -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"libvirt-24-format","id":"virtio-disk0","bootindex":1}' \
 -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso","node-name":"libvirt-23-storage","read-only":true}' \
@@ -46,7 +46,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsock"},"export":"bar","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"qcow2","file":"libvirt-17-storage","backing":"libvirt-18-format"}' \
 -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"libvirt-17-format","id":"virtio-disk1"}' \
--blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":[{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"node-name":"libvirt-16-storage","read-only":false}' \
+-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"Volume1/Image","node-name":"libvirt-16-storage","read-only":false}' \
 -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-16-storage","id":"virtio-disk2"}' \
 -blockdev '{"driver":"file","filename":"/tmp/image.qcow","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-15-format","read-only":true,"driver":"qcow2","file":"libvirt-15-storage","backing":null}' \
diff --git a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.xml
index ad81cd4696..7d9405b6a8 100644
--- a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.xml
@@ -19,7 +19,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source protocol='gluster' name='Volume2/Image'>
+      <source protocol='nbd' name='Volume2/Image'>
         <host transport='unix' socket='/path/to/sock'/>
       </source>
       <backingStore type='file'>
@@ -68,7 +68,7 @@
     </disk>
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
-      <source protocol='gluster' name='Volume1/Image'>
+      <source protocol='nbd' name='Volume1/Image'>
         <host name='example.org' port='6000'/>
       </source>
       <backingStore/>
diff --git a/tests/qemuxmlconfdata/disk-backing-chains-noindex.xml b/tests/qemuxmlconfdata/disk-backing-chains-noindex.xml
index dc928f7075..375882486d 100644
--- a/tests/qemuxmlconfdata/disk-backing-chains-noindex.xml
+++ b/tests/qemuxmlconfdata/disk-backing-chains-noindex.xml
@@ -16,7 +16,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='network' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source protocol='gluster' name='Volume2/Image'>
+      <source protocol='nbd' name='Volume2/Image'>
         <host transport='unix' socket='/path/to/sock'/>
       </source>
       <backingStore type='file'>
@@ -65,7 +65,7 @@
     <disk type='network' device='disk'>
       <driver name='qemu' type='raw'/>
       <backingStore/>
-      <source protocol='gluster' name='Volume1/Image'>
+      <source protocol='nbd' name='Volume1/Image'>
         <host name='example.org' port='6000'/>
       </source>
       <target dev='vdc' bus='virtio'/>