diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c
index d732c6c..f2658cb 100644
--- a/test-tool/iscsi-support.c
+++ b/test-tool/iscsi-support.c
@@ -4692,6 +4692,13 @@ writeverify10(struct iscsi_context *iscsi, int lun, uint32_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
+		return -2;
+	}
 	if (task->status != SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 command: "
 			"failed with sense. %s", iscsi_get_error(iscsi));
@@ -4730,6 +4737,13 @@ writeverify10_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint32_t l
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 successful but should "
 			"have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB");
@@ -4778,6 +4792,13 @@ writeverify10_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 successful but should "
 			"have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE");
@@ -4825,6 +4846,13 @@ writeverify10_writeprotected(struct iscsi_context *iscsi, int lun, uint32_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 successful but should "
 			"have failed with DATA_PROTECTION/WRITE_PROTECTED");
@@ -4873,6 +4901,13 @@ writeverify10_nomedium(struct iscsi_context *iscsi, int lun, uint32_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 successful but should "
 			"have failed with NOT_READY/MEDIUM_NOT_PRESENT*");
@@ -4922,6 +4957,13 @@ writeverify12(struct iscsi_context *iscsi, int lun, uint32_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
+		return -2;
+	}
 	if (task->status != SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 command: "
 			"failed with sense. %s", iscsi_get_error(iscsi));
@@ -4960,6 +5002,13 @@ writeverify12_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint32_t l
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 successful but should "
 			"have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB");
@@ -5008,6 +5057,13 @@ writeverify12_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 successful but should "
 			"have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE");
@@ -5055,6 +5111,13 @@ writeverify12_writeprotected(struct iscsi_context *iscsi, int lun, uint32_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 successful but should "
 			"have failed with DATA_PROTECTION/WRITE_PROTECTED");
@@ -5103,6 +5166,13 @@ writeverify12_nomedium(struct iscsi_context *iscsi, int lun, uint32_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 successful but should "
 			"have failed with NOT_READY/MEDIUM_NOT_PRESENT*");
@@ -5152,6 +5222,13 @@ writeverify16(struct iscsi_context *iscsi, int lun, uint64_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
+		return -2;
+	}
 	if (task->status != SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 command: "
 			"failed with sense. %s", iscsi_get_error(iscsi));
@@ -5190,6 +5267,13 @@ writeverify16_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint64_t l
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 successful but should "
 			"have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB");
@@ -5238,6 +5322,13 @@ writeverify16_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 successful but should "
 			"have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE");
@@ -5285,6 +5376,13 @@ writeverify16_writeprotected(struct iscsi_context *iscsi, int lun, uint64_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 successful but should "
 			"have failed with DATA_PROTECTION/WRITE_PROTECTED");
@@ -5333,6 +5431,13 @@ writeverify16_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba,
 		       iscsi_get_error(iscsi));
 		return -1;
 	}
+	if (task->status        == SCSI_STATUS_CHECK_CONDITION
+	    && task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+	    && task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+		scsi_free_scsi_task(task);
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
+		return -2;
+	}
 	if (task->status == SCSI_STATUS_GOOD) {
 		logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 successful but should "
 			"have failed with NOT_READY/MEDIUM_NOT_PRESENT*");
diff --git a/test-tool/test_writeverify10_0blocks.c b/test-tool/test_writeverify10_0blocks.c
index 3c633df..920fc40 100644
--- a/test-tool/test_writeverify10_0blocks.c
+++ b/test-tool/test_writeverify10_0blocks.c
@@ -39,6 +39,11 @@ test_writeverify10_0blocks(void)
 	logging(LOG_VERBOSE, "Test WRITEVERIFY10 0-blocks at LBA==0");
 	ret = writeverify10(iscsic, tgt_lun, 0, 0, block_size,
 			    0, 0, 0, 0, NULL);
+	if (ret == -2) {
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
+		CU_PASS("WRITEVERIFY10 is not implemented.");
+		return;
+	}	
 	CU_ASSERT_EQUAL(ret, 0);
 
 	logging(LOG_VERBOSE, "Test WRITEVERIFY10 0-blocks one block past end-of-LUN");
diff --git a/test-tool/test_writeverify10_beyond_eol.c b/test-tool/test_writeverify10_beyond_eol.c
index 7eb9ec0..3b3aac6 100644
--- a/test-tool/test_writeverify10_beyond_eol.c
+++ b/test-tool/test_writeverify10_beyond_eol.c
@@ -45,6 +45,11 @@ test_writeverify10_beyond_eol(void)
 						  i * block_size, block_size,
 						  0, 0, 0, 0, buf);
 		free(buf);
+		if (ret == -2) {
+			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY10 is not implemented.");
+			CU_PASS("WRITEVERIFY10 is not implemented.");
+			return;
+		}	
 		CU_ASSERT_EQUAL(ret, 0);
 	}
 
diff --git a/test-tool/test_writeverify10_flags.c b/test-tool/test_writeverify10_flags.c
index a802b94..39fa3c0 100644
--- a/test-tool/test_writeverify10_flags.c
+++ b/test-tool/test_writeverify10_flags.c
@@ -41,6 +41,11 @@ test_writeverify10_flags(void)
 	ret = writeverify10(iscsic, tgt_lun, 0,
 		     block_size, block_size,
 		     0, 1, 0, 0, buf);
+	if (ret == -2) {
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
+		CU_PASS("WRITEVERIFY10 is not implemented.");
+		return;
+	}	
 	CU_ASSERT_EQUAL(ret, 0);
 
 	logging(LOG_VERBOSE, "Test WRITEVERIFY10 with BYTCHK==1");
diff --git a/test-tool/test_writeverify10_residuals.c b/test-tool/test_writeverify10_residuals.c
index 8cc322b..0152e8f 100644
--- a/test-tool/test_writeverify10_residuals.c
+++ b/test-tool/test_writeverify10_residuals.c
@@ -74,6 +74,13 @@ test_writeverify10_residuals(void)
 	CU_ASSERT_PTR_NOT_NULL(task_ret);
 	CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */
 
+	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] WRITEVERIFY10 is not implemented.");
+		CU_PASS("WRITEVERIFY10 is not implemented.");
+		return;
+	}	
 	logging(LOG_VERBOSE, "Verify that the target returned SUCCESS");
 	if (task->status != SCSI_STATUS_GOOD) {
 		logging(LOG_VERBOSE, "[FAILED] Target returned error %s",
diff --git a/test-tool/test_writeverify10_wrprotect.c b/test-tool/test_writeverify10_wrprotect.c
index fa37dd6..a705d91 100644
--- a/test-tool/test_writeverify10_wrprotect.c
+++ b/test-tool/test_writeverify10_wrprotect.c
@@ -44,6 +44,11 @@ test_writeverify10_wrprotect(void)
 		ret = writeverify10_invalidfieldincdb(iscsic, tgt_lun, 0,
 						      block_size, block_size,
 						      i, 0, 0, 0, buf);
+		if (ret == -2) {
+			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY10 is not implemented.");
+			CU_PASS("WRITEVERIFY10 is not implemented.");
+			return;
+		}	
 		CU_ASSERT_EQUAL(ret, 0);
 	}
 	free(buf);
diff --git a/test-tool/test_writeverify12_0blocks.c b/test-tool/test_writeverify12_0blocks.c
index 524ccb1..1d8b60d 100644
--- a/test-tool/test_writeverify12_0blocks.c
+++ b/test-tool/test_writeverify12_0blocks.c
@@ -39,6 +39,11 @@ test_writeverify12_0blocks(void)
 	logging(LOG_VERBOSE, "Test WRITEVERIFY12 0-blocks at LBA==0");
 	ret = writeverify12(iscsic, tgt_lun, 0, 0, block_size,
 			    0, 0, 0, 0, NULL);
+	if (ret == -2) {
+		logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+		CU_PASS("WRITEVERIFY12 is not implemented.");
+		return;
+	}	
 	CU_ASSERT_EQUAL(ret, 0);
 
 	logging(LOG_VERBOSE, "Test WRITEVERIFY12 0-blocks one block past end-of-LUN");
diff --git a/test-tool/test_writeverify12_beyond_eol.c b/test-tool/test_writeverify12_beyond_eol.c
index 3ab797a..5a60227 100644
--- a/test-tool/test_writeverify12_beyond_eol.c
+++ b/test-tool/test_writeverify12_beyond_eol.c
@@ -45,6 +45,11 @@ test_writeverify12_beyond_eol(void)
 						  i * block_size, block_size,
 						  0, 0, 0, 0, buf);
 		free(buf);
+		if (ret == -2) {
+			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+			CU_PASS("WRITEVERIFY12 is not implemented.");
+			return;
+		}	
 		CU_ASSERT_EQUAL(ret, 0);
 	}
 
diff --git a/test-tool/test_writeverify12_flags.c b/test-tool/test_writeverify12_flags.c
index 2fac4b2..0cecb2f 100644
--- a/test-tool/test_writeverify12_flags.c
+++ b/test-tool/test_writeverify12_flags.c
@@ -41,6 +41,11 @@ test_writeverify12_flags(void)
 	ret = writeverify12(iscsic, tgt_lun, 0,
 		     block_size, block_size,
 		     0, 1, 0, 0, buf);
+	if (ret == -2) {
+		logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+		CU_PASS("WRITEVERIFY12 is not implemented.");
+		return;
+	}	
 	CU_ASSERT_EQUAL(ret, 0);
 
 	logging(LOG_VERBOSE, "Test WRITEVERIFY12 with BYTCHK==1");
diff --git a/test-tool/test_writeverify12_residuals.c b/test-tool/test_writeverify12_residuals.c
index 4633e48..d7ac5ef 100644
--- a/test-tool/test_writeverify12_residuals.c
+++ b/test-tool/test_writeverify12_residuals.c
@@ -74,6 +74,13 @@ test_writeverify12_residuals(void)
 	CU_ASSERT_PTR_NOT_NULL(task_ret);
 	CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */
 
+	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] WRITEVERIFY12 is not implemented.");
+		CU_PASS("WRITEVERIFY12 is not implemented.");
+		return;
+	}	
 	logging(LOG_VERBOSE, "Verify that the target returned SUCCESS");
 	if (task->status != SCSI_STATUS_GOOD) {
 		logging(LOG_VERBOSE, "[FAILED] Target returned error %s",
diff --git a/test-tool/test_writeverify12_simple.c b/test-tool/test_writeverify12_simple.c
index 720b641..46c6302 100644
--- a/test-tool/test_writeverify12_simple.c
+++ b/test-tool/test_writeverify12_simple.c
@@ -42,9 +42,10 @@ test_writeverify12_simple(void)
 		    block_size, 0, 0, 0, 0, buf);
 		free(buf);
 		if (ret == -2) {
-			CU_PASS("[SKIPPED] Target does not support WRITEVERIFY12. Skipping test");
+			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+			CU_PASS("WRITEVERIFY12 is not implemented.");
 			return;
-		}
+		}	
 		CU_ASSERT_EQUAL(ret, 0);
 	}
 
diff --git a/test-tool/test_writeverify12_wrprotect.c b/test-tool/test_writeverify12_wrprotect.c
index f7c1bfe..e50fc35 100644
--- a/test-tool/test_writeverify12_wrprotect.c
+++ b/test-tool/test_writeverify12_wrprotect.c
@@ -44,6 +44,11 @@ test_writeverify12_wrprotect(void)
 		ret = writeverify12_invalidfieldincdb(iscsic, tgt_lun, 0,
 						      block_size, block_size,
 						      i, 0, 0, 0, buf);
+		if (ret == -2) {
+			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+			CU_PASS("WRITEVERIFY12 is not implemented.");
+			return;
+		}	
 		CU_ASSERT_EQUAL(ret, 0);
 	}
 	free(buf);
diff --git a/test-tool/test_writeverify16_0blocks.c b/test-tool/test_writeverify16_0blocks.c
index 8349a68..07adf51 100644
--- a/test-tool/test_writeverify16_0blocks.c
+++ b/test-tool/test_writeverify16_0blocks.c
@@ -36,6 +36,11 @@ test_writeverify16_0blocks(void)
 	ret = writeverify16(iscsic, tgt_lun, 0,
 			    0, block_size,
 			    0, 0, 0, 0, NULL);
+	if (ret == -2) {
+		logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+		CU_PASS("WRITEVERIFY16 is not implemented.");
+		return;
+       	}	
 	CU_ASSERT_EQUAL(ret, 0);
 
 	logging(LOG_VERBOSE, "Test WRITEVERIFY16 0-blocks one block past end-of-LUN");
diff --git a/test-tool/test_writeverify16_beyond_eol.c b/test-tool/test_writeverify16_beyond_eol.c
index 957d42e..a8030e1 100644
--- a/test-tool/test_writeverify16_beyond_eol.c
+++ b/test-tool/test_writeverify16_beyond_eol.c
@@ -42,6 +42,11 @@ test_writeverify16_beyond_eol(void)
 						  i * block_size, block_size,
 						  0, 0, 0, 0, buf);
 		free(buf);
+		if (ret == -2) {
+			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+			CU_PASS("WRITEVERIFY16 is not implemented.");
+			return;
+	       	}	
 		CU_ASSERT_EQUAL(ret, 0);
 	}
 
diff --git a/test-tool/test_writeverify16_flags.c b/test-tool/test_writeverify16_flags.c
index 3aaa514..b9abeb0 100644
--- a/test-tool/test_writeverify16_flags.c
+++ b/test-tool/test_writeverify16_flags.c
@@ -41,6 +41,11 @@ test_writeverify16_flags(void)
 	ret = writeverify16(iscsic, tgt_lun, 0,
 		     block_size, block_size,
 		     0, 1, 0, 0, buf);
+	if (ret == -2) {
+		logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+		CU_PASS("WRITEVERIFY16 is not implemented.");
+		return;
+       	}	
 	CU_ASSERT_EQUAL(ret, 0);
 
 	logging(LOG_VERBOSE, "Test WRITEVERIFY16 with BYTCHK==1");
diff --git a/test-tool/test_writeverify16_residuals.c b/test-tool/test_writeverify16_residuals.c
index eb6b3b8..32e2cc9 100644
--- a/test-tool/test_writeverify16_residuals.c
+++ b/test-tool/test_writeverify16_residuals.c
@@ -74,6 +74,13 @@ test_writeverify16_residuals(void)
 	CU_ASSERT_PTR_NOT_NULL(task_ret);
 	CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */
 
+	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] WRITEVERIFY16 is not implemented.");
+		CU_PASS("WRITEVERIFY16 is not implemented.");
+		return;
+	}	
 	logging(LOG_VERBOSE, "Verify that the target returned SUCCESS");
 	if (task->status != SCSI_STATUS_GOOD) {
 		logging(LOG_VERBOSE, "[FAILED] Target returned error %s",
diff --git a/test-tool/test_writeverify16_simple.c b/test-tool/test_writeverify16_simple.c
index 30f6d0b..d10f8a9 100644
--- a/test-tool/test_writeverify16_simple.c
+++ b/test-tool/test_writeverify16_simple.c
@@ -42,6 +42,11 @@ test_writeverify16_simple(void)
 		ret = writeverify16(iscsic, tgt_lun, 0, i * block_size,
 		    block_size, 0, 0, 0, 0, buf);
 		free(buf);
+		if (ret == -2) {
+			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+			CU_PASS("WRITEVERIFY16 is not implemented.");
+			return;
+	       	}	
 		CU_ASSERT_EQUAL(ret, 0);
 	}
 
diff --git a/test-tool/test_writeverify16_wrprotect.c b/test-tool/test_writeverify16_wrprotect.c
index f1b6afd..3f29e62 100644
--- a/test-tool/test_writeverify16_wrprotect.c
+++ b/test-tool/test_writeverify16_wrprotect.c
@@ -45,6 +45,11 @@ test_writeverify16_wrprotect(void)
 		ret = writeverify16_invalidfieldincdb(iscsic, tgt_lun, 0,
 					       block_size, block_size,
 					       i, 0, 0, 0, buf);
+		if (ret == -2) {
+			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+			CU_PASS("WRITEVERIFY16 is not implemented.");
+			return;
+	       	}	
 		CU_ASSERT_EQUAL(ret, 0);
 	}
 	free(buf);