diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c
index 0f3e2e8..08f9fba 100644
--- a/test-tool/iscsi-support.c
+++ b/test-tool/iscsi-support.c
@@ -1573,11 +1573,38 @@ testunitready_conflict(struct iscsi_context *iscsi, int lun)
 	return 0;
 }
 
+struct scsi_task *get_lba_status_task(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len)
+{
+	struct scsi_task *task;
+
+	logging(LOG_VERBOSE, "Send GET_LBA_STATUS LBA:%" PRIu64 " alloc_len:%d",
+		lba, len);
+
+	task = iscsi_get_lba_status_sync(iscsi, lun, lba, len);
+	if (task == NULL) {
+		logging(LOG_NORMAL, "[FAILED] Failed to send GET_LBA_STATUS "
+			"command: %s",
+			iscsi_get_error(iscsi));
+		return NULL;
+	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		logging(LOG_NORMAL, "[SKIPPED] GET_LBA_STATUS is not "
+			"implemented on target");
+		scsi_free_scsi_task(task);
+		return NULL;
+	}
+
+	logging(LOG_VERBOSE, "[OK] GET_LBA_STATUS returned SUCCESS.");
+	return task;
+}
+
 int get_lba_status(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len)
 {
 	struct scsi_task *task;
 
-	logging(LOG_VERBOSE, "Send GET_LBA_STATUS LBA:%" PRIu64 " blocks:%d",
+	logging(LOG_VERBOSE, "Send GET_LBA_STATUS LBA:%" PRIu64 " alloc_len:%d",
 		lba, len);
 
 	task = iscsi_get_lba_status_sync(iscsi, lun, lba, len);
@@ -1611,7 +1638,7 @@ int get_lba_status_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t
 {
 	struct scsi_task *task;
 
-	logging(LOG_VERBOSE, "Send GET_LBA_STATUS (Expecting LBA_OUT_OF_RANGE) LBA:%" PRIu64 " blocks:%d",
+	logging(LOG_VERBOSE, "Send GET_LBA_STATUS (Expecting LBA_OUT_OF_RANGE) LBA:%" PRIu64 " alloc_len:%d",
 		lba, len);
 
 	task = iscsi_get_lba_status_sync(iscsi, lun, lba, len);
@@ -1652,7 +1679,7 @@ int get_lba_status_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba,
 	struct scsi_task *task;
 
 	logging(LOG_VERBOSE, "Send GET_LBA_STATUS (Expecting MEDIUM_NOT_PRESENT) "
-		"LBA:%" PRIu64 " blocks:%d",
+		"LBA:%" PRIu64 " alloc_len:%d",
 		lba, len);
 
 	task = iscsi_get_lba_status_sync(iscsi, lun, lba, len);
diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h
index 5f436d4..a2ac902 100644
--- a/test-tool/iscsi-support.h
+++ b/test-tool/iscsi-support.h
@@ -225,6 +225,7 @@ int verify_read_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf);
 int verify_write_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf);
 int inquiry(struct iscsi_context *iscsi, int lun, int evpd, int page_code, int maxsize, struct scsi_task **save_task);
 int inquiry_invalidfieldincdb(struct iscsi_context *iscsi, int lun, int evpd, int page_code, int maxsize);
+struct scsi_task *get_lba_status_task(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len);
 int get_lba_status(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len);
 int get_lba_status_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len);
 int get_lba_status_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len);
diff --git a/test-tool/test_sanitize_block_erase.c b/test-tool/test_sanitize_block_erase.c
index 40f1bd1..1477303 100644
--- a/test-tool/test_sanitize_block_erase.c
+++ b/test-tool/test_sanitize_block_erase.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <alloca.h>
+#include <inttypes.h>
 
 #include <CUnit/CUnit.h>
 
@@ -105,6 +106,96 @@ check_wabereq(void)
 	scsi_free_scsi_task(task_ret);
 }
 
+static void
+check_unmap(void)
+{
+	int i;
+	struct scsi_task *task_ret;
+	struct scsi_get_lba_status *lbas;
+	uint64_t lba;
+
+	logging(LOG_VERBOSE, "Read LBA mapping from the target");
+	task_ret = get_lba_status_task(iscsic, tgt_lun, 0, 256);
+	if (task_ret == NULL) {
+		logging(LOG_VERBOSE, "[FAILED] Failed to read LBA mapping "
+			"from the target.");
+		CU_FAIL("[FAILED] Failed to read LBA mapping "
+			"from the target.");
+		return;
+	}
+	if (task_ret->status != SCSI_STATUS_GOOD) {
+		logging(LOG_VERBOSE, "[FAILED] Failed to read LBA mapping "
+			"from the target. Sense: %s",
+			iscsi_get_error(iscsic));
+		CU_FAIL("[FAILED] Failed to read LBA mapping "
+			"from the target.");
+		scsi_free_scsi_task(task_ret);
+		return;
+	}
+
+
+	logging(LOG_VERBOSE, "Unmarshall LBA mapping datain buffer");
+	lbas = scsi_datain_unmarshall(task_ret);
+	if (lbas == NULL) {
+		logging(LOG_VERBOSE, "[FAILED] Failed to unmarshall LBA "
+			"mapping");
+		CU_FAIL("[FAILED] Failed to read unmarshall LBA mapping");
+		scsi_free_scsi_task(task_ret);
+		return;
+	}
+
+	logging(LOG_VERBOSE, "Verify we got at least one status descriptor "
+		"from the target");
+	if (lbas->num_descriptors < 1) {
+		logging(LOG_VERBOSE, "[FAILED] Wrong number of LBA status "
+			"descriptors. Expected >=1 but got %d descriptors",
+			lbas->num_descriptors);
+		CU_FAIL("[FAILED] Wrong number of LBA status descriptors.");
+		scsi_free_scsi_task(task_ret);
+		return;
+	}
+
+	logging(LOG_VERBOSE, "Verify that all descriptors are either "
+		"DEALLOCATED or ANCHORED.");
+	for (i = 0; i < (int)lbas->num_descriptors; i++) {
+		logging(LOG_VERBOSE, "Check descriptor %d LBA:%" PRIu64 "-%"
+			PRIu64 " that it is not MAPPED",
+			i,
+			lbas->descriptors[i].lba,
+			lbas->descriptors[i].lba + lbas->descriptors[i].num_blocks);
+		if (lbas->descriptors[i].provisioning == SCSI_PROVISIONING_TYPE_MAPPED) {
+		  	logging(LOG_VERBOSE, "[FAILED] Descriptor %d is MAPPED."
+				"All descriptors shoudl be either DEALLOCATED "
+				"or ANCHORED after SANITIZE", i);
+		  	CU_FAIL("[FAILED] LBA status descriptor is MAPPED.");
+		}
+	}
+
+	logging(LOG_VERBOSE, "Verify that the descriptors cover the whole LUN");
+	lba = 0;
+	for (i = 0; i < (int)lbas->num_descriptors; i++) {
+		logging(LOG_VERBOSE, "Check descriptor %d LBA:%" PRIu64 "-%"
+			PRIu64 " that it is in order",
+			i,
+			lbas->descriptors[i].lba,
+			lbas->descriptors[i].lba + lbas->descriptors[i].num_blocks);
+		if (lba != lbas->descriptors[i].lba) {
+		  	logging(LOG_VERBOSE, "[FAILED] LBA status descriptors "
+				"are not in order.");
+		  	CU_FAIL("[FAILED] LBA status descriptors not in order");
+		}
+		lba += lbas->descriptors[i].num_blocks;
+	}
+	if (lba != num_blocks) {
+	  	logging(LOG_VERBOSE, "[FAILED] The LUN is not fully"
+			"DEALLOCATED/ANCHORED");
+	  	CU_FAIL("[FAILED] The LUN is not fully"
+			"DEALLOCATED/ANCHORED");
+	}
+
+	scsi_free_scsi_task(task_ret);
+}
+
 void
 test_sanitize_block_erase(void)
 { 
@@ -198,4 +289,8 @@ test_sanitize_block_erase(void)
 			"after SANITIZE works correctly.");
 		check_wabereq();
 	}
+
+	logging(LOG_VERBOSE, "Verify that all blocks are unmapped after "
+		"SANITIZE BLOCK_ERASE");
+	check_unmap();
 }