diff --git a/test/unit/lib/scsi/dev.c/dev_ut.c b/test/unit/lib/scsi/dev.c/dev_ut.c
index 6fa906772..c10a7f0ab 100644
--- a/test/unit/lib/scsi/dev.c/dev_ut.c
+++ b/test/unit/lib/scsi/dev.c/dev_ut.c
@@ -555,8 +555,9 @@ dev_add_lun_bdev_not_found(void)
 	int rc;
 	struct spdk_scsi_dev dev = {0};
 
-	rc = spdk_scsi_dev_add_lun(&dev, "malloc2", -1, NULL, NULL);
+	rc = spdk_scsi_dev_add_lun(&dev, "malloc2", 0, NULL, NULL);
 
+	SPDK_CU_ASSERT_FATAL(dev.lun[0] == NULL);
 	CU_ASSERT_NOT_EQUAL(rc, 0);
 }
 
diff --git a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
index ef5349e9c..4deb2cec4 100644
--- a/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
+++ b/test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
@@ -689,6 +689,8 @@ lba_range_test(void)
 
 	ut_init_task(&task);
 	task.lun = &lun;
+	task.lun->bdev_desc = NULL;
+	task.lun->io_channel = NULL;
 	task.cdb = cdb;
 
 	memset(cdb, 0, sizeof(cdb));
@@ -760,6 +762,8 @@ xfer_len_test(void)
 
 	ut_init_task(&task);
 	task.lun = &lun;
+	task.lun->bdev_desc = NULL;
+	task.lun->io_channel = NULL;
 	task.cdb = cdb;
 
 	memset(cdb, 0, sizeof(cdb));
@@ -847,6 +851,8 @@ _xfer_test(bool bdev_io_pool_full)
 	/* Read 1 block */
 	ut_init_task(&task);
 	task.lun = &lun;
+	task.lun->bdev_desc = NULL;
+	task.lun->io_channel = NULL;
 	task.cdb = cdb;
 	memset(cdb, 0, sizeof(cdb));
 	cdb[0] = 0x88; /* READ (16) */