diff --git a/test/Makefile b/test/Makefile
index d369a4955..ec9ee45f5 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,13 +1,14 @@
 #  SPDX-License-Identifier: BSD-3-Clause
 #  Copyright (C) 2015 Intel Corporation.
 #  All rights reserved.
+#  Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 # These directories contain tests.
-TESTDIRS = app bdev blobfs cpp_headers dma env event nvme rpc_client thread
+TESTDIRS = app bdev blobfs cpp_headers dma env event lvol nvme rpc_client thread
 
 DIRS-$(CONFIG_TESTS) += $(TESTDIRS)
 DIRS-$(CONFIG_UNIT_TESTS) += unit
diff --git a/test/lvol/Makefile b/test/lvol/Makefile
new file mode 100644
index 000000000..e6b9fd425
--- /dev/null
+++ b/test/lvol/Makefile
@@ -0,0 +1,15 @@
+#  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#
+
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+
+DIRS-y = esnap
+
+.PHONY: all clean $(DIRS-y)
+
+all: $(DIRS-y)
+clean: $(DIRS-y)
+
+include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk
diff --git a/test/lvol/esnap/.gitignore b/test/lvol/esnap/.gitignore
new file mode 100644
index 000000000..0d3ea2324
--- /dev/null
+++ b/test/lvol/esnap/.gitignore
@@ -0,0 +1 @@
+esnap
diff --git a/test/lvol/esnap/Makefile b/test/lvol/esnap/Makefile
new file mode 100644
index 000000000..300afaa02
--- /dev/null
+++ b/test/lvol/esnap/Makefile
@@ -0,0 +1,10 @@
+#  SPDX-License-Identifier: BSD-3-Clause
+#  Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
+
+TEST_FILE = esnap.c
+
+SPDK_LIB_LIST = accel bdev blob blob_bdev dma init lvol notify
+
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/lvol/esnap/esnap.c b/test/lvol/esnap/esnap.c
new file mode 100644
index 000000000..db9e3579b
--- /dev/null
+++ b/test/lvol/esnap/esnap.c
@@ -0,0 +1,346 @@
+/*   SPDX-License-Identifier: BSD-3-Clause
+ *   Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ */
+
+#include "spdk_cunit.h"
+#include "spdk/string.h"
+#include "spdk/init.h"
+
+#include "common/lib/ut_multithread.c"
+
+#include "bdev/bdev.c"
+#include "bdev/malloc/bdev_malloc.c"
+#include "bdev/lvol/vbdev_lvol.c"
+#include "accel/accel_sw.c"
+#include "blob/blobstore.h"
+
+#include "unit/lib/json_mock.c"
+
+#ifdef SPDK_CONFIG_PMDK
+DEFINE_STUB(pmem_msync, int, (const void *addr, size_t len), 0);
+DEFINE_STUB(pmem_memcpy_persist, void *, (void *pmemdest, const void *src, size_t len), NULL);
+DEFINE_STUB(pmem_is_pmem, int, (const void *addr, size_t len), 0);
+DEFINE_STUB(pmem_memset_persist, void *, (void *pmemdest, int c, size_t len), NULL);
+#endif
+
+struct op_with_handle_data {
+	union {
+		struct spdk_lvol_store *lvs;
+		struct spdk_lvol *lvol;
+	} u;
+	int lvserrno;
+};
+
+static struct op_with_handle_data *
+clear_owh(struct op_with_handle_data *owh)
+{
+	memset(owh, 0, sizeof(*owh));
+	owh->lvserrno = 0xbad;
+
+	return owh;
+}
+
+static void
+lvs_op_with_handle_cb(void *cb_arg, struct spdk_lvol_store *lvs, int lvserrno)
+{
+	struct op_with_handle_data *data = cb_arg;
+
+	data->u.lvs = lvs;
+	data->lvserrno = lvserrno;
+}
+
+static void
+lvol_op_with_handle_cb(void *cb_arg, struct spdk_lvol *lvol, int lvserrno)
+{
+	struct op_with_handle_data *data = cb_arg;
+
+	data->u.lvol = lvol;
+	data->lvserrno = lvserrno;
+}
+
+static void
+ut_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *bdev, void *event_ctx)
+{
+}
+
+static void
+io_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)
+{
+	int *err = cb_arg;
+
+	spdk_bdev_free_io(bdev_io);
+	SPDK_CU_ASSERT_FATAL(success);
+
+	*err = 0;
+}
+
+static void
+prepare_block(char *buf, size_t bufsz, const char *uuid_str, uint64_t block)
+{
+	memset(buf, 0, bufsz);
+	snprintf(buf, bufsz, "%s %8" PRIu64, uuid_str, block);
+}
+
+static void
+scribble(struct spdk_bdev_desc *desc, uint64_t start, uint64_t count)
+{
+	struct spdk_bdev *bdev = desc->bdev;
+	const uint32_t blocklen = desc->bdev->blocklen;
+	struct spdk_io_channel *ch = spdk_bdev_get_io_channel(desc);
+	char uuid_str[SPDK_UUID_STRING_LEN];
+	char buf[count][blocklen];
+	int err = 0xbad;
+	uint64_t i;
+
+	SPDK_CU_ASSERT_FATAL(count > 0 && count < INT32_MAX);
+	SPDK_CU_ASSERT_FATAL(ch != NULL);
+
+	spdk_uuid_fmt_lower(uuid_str, sizeof(uuid_str), &bdev->uuid);
+
+	for (i = 0; i < count; i++) {
+		prepare_block(buf[i], sizeof(buf[i]), uuid_str, start + i);
+	}
+
+	spdk_bdev_write(desc, ch, buf, start * blocklen, sizeof(buf), io_done, &err);
+	poll_threads();
+	SPDK_CU_ASSERT_FATAL(err == 0);
+	spdk_put_io_channel(ch);
+	poll_threads();
+}
+
+#define verify(desc, bdev, start, count) _verify(desc, bdev, start, count, __FILE__, __LINE__)
+
+static bool
+_verify(struct spdk_bdev_desc *desc, struct spdk_bdev *bdev, uint64_t start, uint64_t count,
+	const char *file, int line)
+{
+	struct spdk_io_channel *ch = spdk_bdev_get_io_channel(desc);
+	const uint32_t blocklen = desc->bdev->blocklen;
+	char uuid_str[SPDK_UUID_STRING_LEN];
+	char buf[blocklen];
+	char expect[blocklen];
+	int err = 0xbad;
+	bool ret = true;
+	uint64_t i;
+
+	SPDK_CU_ASSERT_FATAL(count > 0 && count < INT32_MAX);
+	SPDK_CU_ASSERT_FATAL(ch != NULL);
+
+	spdk_uuid_fmt_lower(uuid_str, sizeof(uuid_str), &bdev->uuid);
+
+	for (i = 0; i < count; i++) {
+		uint64_t block = start + i;
+
+		spdk_bdev_read(desc, ch, buf, block * blocklen, sizeof(buf), io_done, &err);
+		poll_threads();
+		SPDK_CU_ASSERT_FATAL(err == 0);
+		prepare_block(expect, sizeof(expect), uuid_str, block);
+		if (memcmp(expect, buf, blocklen) != 0) {
+			printf("%s:%d: ERROR: expected '%s' got '%s'\n", file, line,
+			       expect, buf);
+			ret = false;
+		}
+	}
+
+	spdk_put_io_channel(ch);
+	poll_threads();
+
+	return ret;
+}
+
+static bool
+cluster_is_allocated(struct spdk_blob *blob, uint32_t cluster)
+{
+	return bs_io_unit_is_allocated(blob, cluster * blob->bs->pages_per_cluster);
+}
+
+static void
+esnap_clone_io(void)
+{
+	struct spdk_lvol_store *lvs = NULL;
+	struct spdk_bdev *bs_bdev = NULL;
+	struct spdk_bdev *esnap_bdev = NULL;
+	struct spdk_bdev *lvol_bdev = NULL;
+	struct spdk_bdev_desc *esnap_desc = NULL;
+	struct spdk_bdev_desc *lvol_desc = NULL;
+	const char bs_malloc_uuid[SPDK_UUID_STRING_LEN] = "11110049-cf29-4681-ab4b-5dd16de6cd81";
+	const char esnap_uuid[SPDK_UUID_STRING_LEN] = "222251be-1ece-434d-8513-6944d5c93a53";
+	struct malloc_bdev_opts malloc_opts = { 0 };
+	const uint32_t bs_size_bytes = 10 * 1024 * 1024;
+	const uint32_t bs_block_size = 4096;
+	const uint32_t cluster_size = 32 * 1024;
+	const uint32_t blocks_per_cluster = cluster_size / bs_block_size;
+	const uint32_t esnap_size_bytes = 4 * cluster_size;
+	struct op_with_handle_data owh_data = { 0 };
+	struct lvol_bdev *_lvol_bdev;
+	struct spdk_blob *blob;
+	int rc;
+
+	g_bdev_opts.bdev_auto_examine = false;
+
+	/* Create device for lvstore */
+	spdk_uuid_parse(&malloc_opts.uuid, bs_malloc_uuid);
+	malloc_opts.name = "bs_malloc";
+	malloc_opts.num_blocks = bs_size_bytes / bs_block_size;
+	malloc_opts.block_size = bs_block_size;
+	rc = create_malloc_disk(&bs_bdev, &malloc_opts);
+	SPDK_CU_ASSERT_FATAL(rc == 0);
+
+	/* Create lvstore */
+	rc = vbdev_lvs_create("bs_malloc", "lvs1", cluster_size, 0, 0,
+			      lvs_op_with_handle_cb, &owh_data);
+	SPDK_CU_ASSERT_FATAL(rc == 0);
+	poll_threads();
+	SPDK_CU_ASSERT_FATAL(owh_data.lvserrno == 0);
+	SPDK_CU_ASSERT_FATAL(owh_data.u.lvs != NULL);
+	lvs = owh_data.u.lvs;
+
+	/* Create esnap device */
+	memset(&malloc_opts, 0, sizeof(malloc_opts));
+	spdk_uuid_parse(&malloc_opts.uuid, esnap_uuid);
+	malloc_opts.name = "esnap_malloc";
+	malloc_opts.num_blocks = esnap_size_bytes / bs_block_size;
+	malloc_opts.block_size = bs_block_size;
+	rc = create_malloc_disk(&esnap_bdev, &malloc_opts);
+	SPDK_CU_ASSERT_FATAL(rc == 0);
+
+	/* Fill esnap device with pattern */
+	rc = spdk_bdev_open_ext(esnap_uuid, true, ut_event_cb, NULL, &esnap_desc);
+	SPDK_CU_ASSERT_FATAL(rc == 0);
+	scribble(esnap_desc, 0, esnap_bdev->blockcnt);
+
+	/* Reopen the external snapshot read-only for verification later */
+	spdk_bdev_close(esnap_desc);
+	poll_threads();
+	rc = spdk_bdev_open_ext(esnap_uuid, false, ut_event_cb, NULL, &esnap_desc);
+	SPDK_CU_ASSERT_FATAL(rc == 0);
+
+	/* Create esnap clone */
+	vbdev_lvol_create_bdev_clone(esnap_uuid, lvs, "clone1",
+				     lvol_op_with_handle_cb, clear_owh(&owh_data));
+	poll_threads();
+	SPDK_CU_ASSERT_FATAL(owh_data.lvserrno == 0);
+	SPDK_CU_ASSERT_FATAL(owh_data.u.lvol != NULL);
+
+	/* Open the esnap clone */
+	rc = spdk_bdev_open_ext("lvs1/clone1", true, ut_event_cb, NULL, &lvol_desc);
+	SPDK_CU_ASSERT_FATAL(rc == 0);
+	lvol_bdev = lvol_desc->bdev;
+	_lvol_bdev = (struct lvol_bdev *)lvol_bdev;
+	blob = _lvol_bdev->lvol->blob;
+	CU_ASSERT(blob->active.num_clusters == 4);
+	CU_ASSERT(!cluster_is_allocated(blob, 0));
+	CU_ASSERT(!cluster_is_allocated(blob, 1));
+	CU_ASSERT(!cluster_is_allocated(blob, 2));
+	CU_ASSERT(!cluster_is_allocated(blob, 3));
+
+	/* Be sure the esnap and the clone see the same content. */
+	CU_ASSERT(verify(esnap_desc, esnap_bdev, 0, esnap_bdev->blockcnt));
+	CU_ASSERT(verify(lvol_desc, esnap_bdev, 0, esnap_bdev->blockcnt));
+
+	/* Overwrite the second block of the first cluster then verify the whole first cluster */
+	scribble(lvol_desc, 1, 1);
+	CU_ASSERT(cluster_is_allocated(blob, 0));
+	CU_ASSERT(!cluster_is_allocated(blob, 1));
+	CU_ASSERT(!cluster_is_allocated(blob, 2));
+	CU_ASSERT(!cluster_is_allocated(blob, 3));
+	CU_ASSERT(verify(lvol_desc, esnap_bdev, 0, 1));
+	CU_ASSERT(verify(lvol_desc, lvol_bdev, 1, 1));
+	CU_ASSERT(verify(lvol_desc, esnap_bdev, 2, blocks_per_cluster - 2));
+	/* And be sure no writes made it to the external snapshot */
+	CU_ASSERT(verify(esnap_desc, esnap_bdev, 0, esnap_bdev->blockcnt));
+
+	/* Overwrite the two blocks that span the end of the first cluster and the start of the
+	 * second cluster
+	 */
+	scribble(lvol_desc, blocks_per_cluster - 1, 2);
+	/* The first part of the first cluster was written previously - it should be the same. */
+	CU_ASSERT(cluster_is_allocated(blob, 0));
+	CU_ASSERT(cluster_is_allocated(blob, 1));
+	CU_ASSERT(!cluster_is_allocated(blob, 2));
+	CU_ASSERT(!cluster_is_allocated(blob, 3));
+	CU_ASSERT(verify(lvol_desc, esnap_bdev, 0, 1));
+	CU_ASSERT(verify(lvol_desc, lvol_bdev, 1, 1));
+	CU_ASSERT(verify(lvol_desc, esnap_bdev, 2, blocks_per_cluster - 2 - 1));
+	/* Check the newly written area spanning the first two clusters. */
+	CU_ASSERT(verify(lvol_desc, lvol_bdev, blocks_per_cluster - 1, 2));
+	/* The rest should not have changed. */
+	CU_ASSERT(verify(lvol_desc, esnap_bdev, blocks_per_cluster + 1,
+			 esnap_bdev->blockcnt - blocks_per_cluster - 1));
+	/* And be sure no writes made it to the external snapshot */
+	CU_ASSERT(verify(esnap_desc, esnap_bdev, 0, esnap_bdev->blockcnt));
+
+	/* Clean up */
+	bdev_close(lvol_bdev, lvol_desc);
+	bdev_close(esnap_bdev, esnap_desc);
+	delete_malloc_disk("esnap_malloc", NULL, 0);
+	/* This triggers spdk_lvs_unload() */
+	delete_malloc_disk("bs_malloc", NULL, 0);
+	poll_threads();
+}
+
+static void
+bdev_init_cb(void *arg, int rc)
+{
+	assert(rc == 0);
+}
+
+static void
+subsystem_init_cb(int rc, void *ctx)
+{
+	assert(rc == 0);
+}
+
+static void
+bdev_fini_cb(void *arg)
+{
+}
+
+int
+main(int argc, char **argv)
+{
+	CU_pSuite	suite = NULL;
+	unsigned int	num_failures;
+	int rc;
+
+	CU_set_error_action(CUEA_ABORT);
+	CU_initialize_registry();
+
+	suite = CU_add_suite("esnap_io", NULL, NULL);
+
+	CU_ADD_TEST(suite, esnap_clone_io);
+
+	allocate_threads(2);
+	set_thread(0);
+
+	CU_basic_set_mode(CU_BRM_VERBOSE);
+
+	/*
+	 * This is a non-standard way of initializing libraries. It works for this test but
+	 * shouldn't be used as an example elsewhere, except for maybe other tests.
+	 */
+	spdk_subsystem_init(subsystem_init_cb, NULL);
+	rc = spdk_iobuf_initialize();
+	if (rc != 0) {
+		SPDK_ERRLOG("Failed to initialize iobuf\n");
+		abort();
+	}
+	rc = spdk_accel_initialize();
+	if (rc != 0) {
+		SPDK_ERRLOG("Failed to initialize accel\n");
+		abort();
+	}
+	spdk_bdev_initialize(bdev_init_cb, NULL);
+
+	CU_basic_run_tests();
+	num_failures = CU_get_number_of_failures();
+	CU_cleanup_registry();
+
+	spdk_bdev_finish(bdev_fini_cb, NULL);
+	spdk_accel_finish(bdev_fini_cb, NULL);
+	spdk_iobuf_finish(bdev_fini_cb, NULL);
+
+	free_threads();
+
+	return num_failures;
+}
diff --git a/test/lvol/lvol.sh b/test/lvol/lvol.sh
index 267de1139..fe71d9aa3 100755
--- a/test/lvol/lvol.sh
+++ b/test/lvol/lvol.sh
@@ -2,6 +2,7 @@
 #  SPDX-License-Identifier: BSD-3-Clause
 #  Copyright (C) 2019 Intel Corporation
 #  All rights reserved.
+#  Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
@@ -17,6 +18,7 @@ run_test "lvol_tasting" $rootdir/test/lvol/tasting.sh
 run_test "lvol_snapshot_clone" $rootdir/test/lvol/snapshot_clone.sh
 run_test "lvol_rename" $rootdir/test/lvol/rename.sh
 run_test "lvol_provisioning" $rootdir/test/lvol/thin_provisioning.sh
+run_test "lvol_esnap" $rootdir/test/lvol/esnap/esnap
 timing_exit basic
 
 timing_exit lvol