diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 75d04e8030..4ec837eefb 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -203,6 +203,26 @@ testStorageChain(const void *args)
                           NULLSTR(virStorageFileFormatTypeToString(elt->format)),
                           virStorageNetProtocolTypeToString(elt->protocol),
                           NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL));
+
+        if (elt->dataFileStore) {
+            g_autofree char *strippedPathDataFileRaw = virTestStablePath(elt->dataFileRaw);
+            g_autofree char *strippedPathDataFile = virTestStablePath(elt->dataFileStore->path);
+
+            virBufferAsprintf(&buf,
+                              "dataFileRaw: %s\n\n\n"
+                              "dataFileStoreSource:\n"
+                              "path: %s\n"
+                              "capacity: %lld\n"
+                              "encryption: %d\n"
+                              "type:%s\n"
+                              "format:%s\n",
+                              strippedPathDataFileRaw,
+                              strippedPathDataFile,
+                              elt->dataFileStore->capacity,
+                              !!elt->dataFileStore->encryption,
+                              NULLSTR(virStorageTypeToString(elt->dataFileStore->type)),
+                              NULLSTR(virStorageFileFormatTypeToString(elt->dataFileStore->format)));
+        }
     }
 
     virBufferTrim(&buf, "\n");
@@ -464,6 +484,16 @@ mymain(void)
 
     testCleanupImages();
 
+    /* qcow2 + datafile
+     * 1) qcow2 image with data file
+     * 2) qcow2 -> qcow2 backing image with data file */
+    TEST_CHAIN("qcow2-datafile",
+               abs_srcdir "/virstoragetestdata/images/datafile.qcow2",
+               VIR_STORAGE_FILE_QCOW2, EXP_PASS);
+    TEST_CHAIN("qcow2datafile-qcow2_qcow2-datafile",
+               abs_srcdir "/virstoragetestdata/images/qcow2datafile-datafile.qcow2",
+               VIR_STORAGE_FILE_QCOW2, EXP_PASS);
+
     /* Test various combinations of qcow2 images with missing 'backing_format' */
     TEST_CHAIN("qcow2-qcow2_qcow2-qcow2_qcow2-auto",
                abs_srcdir "/virstoragetestdata/images/qcow2_qcow2-qcow2_qcow2-auto.qcow2",
diff --git a/tests/virstoragetestdata/images/datafile.qcow2 b/tests/virstoragetestdata/images/datafile.qcow2
new file mode 100644
index 0000000000..32f3acff86
Binary files /dev/null and b/tests/virstoragetestdata/images/datafile.qcow2 differ
diff --git a/tests/virstoragetestdata/images/qcow2datafile-datafile.qcow2 b/tests/virstoragetestdata/images/qcow2datafile-datafile.qcow2
new file mode 100644
index 0000000000..1fce3ffbdf
Binary files /dev/null and b/tests/virstoragetestdata/images/qcow2datafile-datafile.qcow2 differ
diff --git a/tests/virstoragetestdata/out/qcow2-datafile b/tests/virstoragetestdata/out/qcow2-datafile
new file mode 100644
index 0000000000..d0f46f7e1b
--- /dev/null
+++ b/tests/virstoragetestdata/out/qcow2-datafile
@@ -0,0 +1,20 @@
+path:ABS_SRCDIR/virstoragetestdata/images/datafile.qcow2
+backingStoreRaw: <null>
+backingStoreRawFormat: none(0)
+capacity: 1024
+encryption: 0
+relPath:<null>
+type:file
+format:qcow2
+protocol:none
+hostname:<null>
+
+dataFileRaw: raw
+
+
+dataFileStoreSource:
+path: ABS_SRCDIR/virstoragetestdata/images/raw
+capacity: 0
+encryption: 0
+type:file
+format:raw
diff --git a/tests/virstoragetestdata/out/qcow2datafile-qcow2_qcow2-datafile b/tests/virstoragetestdata/out/qcow2datafile-qcow2_qcow2-datafile
new file mode 100644
index 0000000000..cc8bac3138
--- /dev/null
+++ b/tests/virstoragetestdata/out/qcow2datafile-qcow2_qcow2-datafile
@@ -0,0 +1,31 @@
+path:ABS_SRCDIR/virstoragetestdata/images/qcow2datafile-datafile.qcow2
+backingStoreRaw: datafile.qcow2
+backingStoreRawFormat: qcow2(14)
+capacity: 1024
+encryption: 0
+relPath:<null>
+type:file
+format:qcow2
+protocol:none
+hostname:<null>
+
+path:ABS_SRCDIR/virstoragetestdata/images/datafile.qcow2
+backingStoreRaw: <null>
+backingStoreRawFormat: none(0)
+capacity: 1024
+encryption: 0
+relPath:datafile.qcow2
+type:file
+format:qcow2
+protocol:none
+hostname:<null>
+
+dataFileRaw: raw
+
+
+dataFileStoreSource:
+path: ABS_SRCDIR/virstoragetestdata/images/raw
+capacity: 0
+encryption: 0
+type:file
+format:raw