diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json
index f510c43edb..b32e2181dc 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json
@@ -36,16 +36,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml
index 610c091f3e..b5a868113b 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json
index e77421d372..62189e7ea4 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json
@@ -36,16 +36,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml
index ad84fab720..dc8ace1b8a 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json
index 7a8d0686f6..caf8928d37 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml
index cf4197ea86..d776061364 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json
index 7a8d0686f6..caf8928d37 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml
index 240afa85d2..308f020888 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json
index 15c8293f63..58a83ad7cf 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml
index e18d33ce3c..cfc5225acb 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json
index 5918eed73f..5124b0328c 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml
index 7040388040..407efe4b38 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json
index 5918eed73f..5124b0328c 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json
@@ -54,16 +54,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap",
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml
index d2fe1b780b..0b60a4987a 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='qcow2'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json
index 6be2df9d1d..c27233269b 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json
@@ -35,16 +35,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml
index eaf89d316a..5502f7d612 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json
index 27e6e5ab60..1ec0b8fffc 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json
@@ -38,16 +38,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml
index 4638a78541..d783f8c583 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json
index 63c5cd2799..315a17323a 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json
@@ -38,16 +38,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml
index b2d599fc6c..760440d16c 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json
index 65a3773b97..8549314e92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json
@@ -19,19 +19,16 @@
 (
   source only properties:
   {
-    "driver": "gluster",
-    "volume": "images",
-    "path": "c",
-    "server": [
-      {
-        "type": "inet",
-        "host": "test.org",
-        "port": "24007"
-      }
-    ]
+    "driver": "nbd",
+    "server": {
+      "type": "inet",
+      "host": "test.org",
+      "port": "10809"
+    },
+    "export": "images/c"
   }
   backing store string:
-  gluster://test.org:24007/images/c
+  nbd://test.org:10809/images/c
 )
 (
   source only properties:
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json
index ac952c8acd..8557d4de92 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json
@@ -37,16 +37,13 @@
   "backing": "node-d-f"
 }
 {
-  "driver": "gluster",
-  "volume": "images",
-  "path": "c",
-  "server": [
-    {
-      "type": "inet",
-      "host": "test.org",
-      "port": "24007"
-    }
-  ],
+  "driver": "nbd",
+  "server": {
+    "type": "inet",
+    "host": "test.org",
+    "port": "10809"
+  },
+  "export": "images/c",
   "node-name": "node-c-s",
   "auto-read-only": true,
   "discard": "unmap"
diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml
index 68484991c1..666b87b94f 100644
--- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml
+++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml
@@ -20,7 +20,7 @@
     </source>
     <backingStore type='network' index='2'>
       <format type='vmdk'/>
-      <source protocol='gluster' name='images/c'>
+      <source protocol='nbd' name='images/c'>
         <host name='test.org'/>
         <privateData>
           <nodenames>