diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c
index eb30c25..c3e7d12 100644
--- a/test-tool/iscsi-support.c
+++ b/test-tool/iscsi-support.c
@@ -1920,8 +1920,8 @@ int
 unmap(struct scsi_device *sdev, int anchor, struct unmap_list *list, int list_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq)
 {
 	struct scsi_task *task;
-	struct scsi_iovec *iov;
 	unsigned char *data;
+	struct iscsi_data d;
 	int xferlen;
 	int i;
 	int ret;
@@ -1956,18 +1956,10 @@ unmap(struct scsi_device *sdev, int anchor, struct unmap_list *list, int list_le
 		scsi_set_uint32(&data[8 + 16 * i + 8], list[i].num);
 	}
 
-	iov = scsi_malloc(task, sizeof(struct scsi_iovec));
-	if (iov == NULL) {
-		logging(LOG_NORMAL, "Out-of-memory: Failed to create "
-			"iov array.");
-		scsi_free_scsi_task(task);
-		return -1;
-	}
-	iov->iov_base = data;
-	iov->iov_len  = xferlen;
-	scsi_task_set_iov_out(task, iov, 1);
+	d.data = data;
+	d.size = xferlen;
 
-	task = send_scsi_command(sdev, task, NULL);
+	task = send_scsi_command(sdev, task, &d);
 
 	ret = check_result("UNMAP", sdev, task, status, key, ascq, num_ascq);
 	if (task) {
diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c
index 48ea6f9..d76e376 100644
--- a/test-tool/iscsi-test-cu.c
+++ b/test-tool/iscsi-test-cu.c
@@ -547,15 +547,9 @@ static libiscsi_suite_info linux_suites[] = {
 	{ "GetLBAStatus", NON_PGR_FUNCS, tests_get_lba_status },
 	{ "Inquiry", NON_PGR_FUNCS, tests_inquiry },
 	{ "Mandatory", NON_PGR_FUNCS, tests_mandatory },
-	{ "ModeSense6", NON_PGR_FUNCS, tests_modesense6 },
 	{ "OrWrite", NON_PGR_FUNCS, tests_orwrite },
 	{ "Prefetch10", NON_PGR_FUNCS, tests_prefetch10 },
 	{ "Prefetch16", NON_PGR_FUNCS, tests_prefetch16 },
-	{ "PrinReadKeys", NON_PGR_FUNCS, tests_prin_read_keys },
-	{ "PrinServiceactionRange", NON_PGR_FUNCS,
-	  tests_prin_serviceaction_range },
-	{ "ProutRegister", NON_PGR_FUNCS, tests_prout_register },
-	{ "ProutReserve", NON_PGR_FUNCS, tests_prout_reserve },
 	{ "Read6", NON_PGR_FUNCS, tests_read6 },
 	{ "Read10", NON_PGR_FUNCS, tests_read10 },
 	{ "Read12", NON_PGR_FUNCS, tests_read12 },
@@ -565,7 +559,6 @@ static libiscsi_suite_info linux_suites[] = {
 	{ "ReadOnly", NON_PGR_FUNCS, tests_readonly },
 	{ "ReportSupportedOpcodes", NON_PGR_FUNCS,
 	  tests_report_supported_opcodes },
-	{ "Reserve6", NON_PGR_FUNCS, tests_reserve6 },
 	{ "TestUnitReady", NON_PGR_FUNCS, tests_testunitready },
 	{ "Unmap", NON_PGR_FUNCS, tests_unmap },
 	{ "Verify10", NON_PGR_FUNCS, tests_verify10 },