diff --git a/Makefile.am b/Makefile.am
index eb59919..081209d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,7 +100,10 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \
 	test-tool/0320_writeverify12_simple.c test-tool/0321_writeverify12_wrprotect.c \
 	test-tool/0324_writeverify12_beyondeol.c \
 	test-tool/0330_writeverify16_simple.c test-tool/0331_writeverify16_wrprotect.c \
-	test-tool/0334_writeverify16_beyondeol.c
+	test-tool/0334_writeverify16_beyondeol.c \
+	test-tool/0340_compareandwrite_simple.c test-tool/0341_compareandwrite_mismatch.c \
+	test-tool/0343_compareandwrite_beyondeol.c
+
 endif
 
 # LD_PRELOAD library.
diff --git a/test-tool/0340_compareandwrite_simple.c b/test-tool/0340_compareandwrite_simple.c
new file mode 100644
index 0000000..509e20e
--- /dev/null
+++ b/test-tool/0340_compareandwrite_simple.c
@@ -0,0 +1,182 @@
+/* 
+   Copyright (C) 2012 by Ronnie Sahlberg <ronniesahlberg@gmail.com>
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include "iscsi.h"
+#include "scsi-lowlevel.h"
+#include "iscsi-test.h"
+
+int T0340_compareandwrite_simple(const char *initiator, const char *url, int data_loss, int show_info)
+{ 
+	struct iscsi_context *iscsi;
+	struct scsi_task *task;
+	struct scsi_readcapacity16 *rc16;
+	int ret, i, lun;
+	uint32_t block_size;
+	uint64_t num_blocks;
+	unsigned char data[512 * 256];
+
+	printf("0340_compareandwrite_simple:\n");
+	printf("===================\n");
+	if (show_info) {
+		printf("Test basic COMPAREANDWRITE functionality.\n");
+		printf("1, Verify we can write the first 1-255 blocks of the LUN.\n");
+		printf("2, Verify we can write the last 1-255 blocks of the LUN.\n");
+		printf("\n");
+		return 0;
+	}
+
+	iscsi = iscsi_context_login(initiator, url, &lun);
+	if (iscsi == NULL) {
+		printf("Failed to login to target\n");
+		return -1;
+	}
+
+	/* find the size of the LUN */
+	task = iscsi_readcapacity16_sync(iscsi, lun);
+	if (task == NULL) {
+		printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		goto finished;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+	rc16 = scsi_datain_unmarshall(task);
+	if (rc16 == NULL) {
+		printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+	block_size = rc16->block_length;
+	num_blocks = rc16->returned_lba;
+	scsi_free_scsi_task(task);
+
+
+	if (!data_loss) {
+		printf("--dataloss flag is not set. Skipping test\n");
+		ret = -1;
+		goto finished;
+	}
+	
+
+	ret = 0;
+
+	/* write the first 1 - 255 blocks at the start of the LUN */
+	printf("Compare and write first 1-255 blocks ... ");
+	for (i = 1; i < 256; i++) {
+		task = iscsi_read16_sync(iscsi, lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send READ16 command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test2;
+		}
+		if (task->status != SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("READ16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+
+		if (task->datain.data == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to access DATA-IN buffer %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		memcpy(data, task->datain.data, i * block_size);
+
+		task = iscsi_compareandwrite_sync(iscsi, lun, 0, data, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test2;
+		}
+		if (task->status != SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE command: failed with sense. %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+
+test2:
+	/* write the last 1 - 255 blocks at the end of the LUN */
+	printf("Compare and write last 1-256 blocks ... ");
+	for (i = 1; i < 256; i++) {
+		task = iscsi_read16_sync(iscsi, lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send READ16 command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test3;
+		}
+		if (task->status != SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("READ16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+
+		if (task->datain.data == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to access DATA-IN buffer %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		memcpy(data, task->datain.data, i * block_size);
+
+		task = iscsi_compareandwrite_sync(iscsi, lun, num_blocks + 1 - i, data, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test3;
+		}
+		if (task->status != SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE command: failed with sense. %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+test3:
+
+finished:
+	iscsi_logout_sync(iscsi);
+	iscsi_destroy_context(iscsi);
+	return ret;
+}
diff --git a/test-tool/0341_compareandwrite_mismatch.c b/test-tool/0341_compareandwrite_mismatch.c
new file mode 100644
index 0000000..20aa50e
--- /dev/null
+++ b/test-tool/0341_compareandwrite_mismatch.c
@@ -0,0 +1,207 @@
+/* 
+   Copyright (C) 2012 by Ronnie Sahlberg <ronniesahlberg@gmail.com>
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include "iscsi.h"
+#include "scsi-lowlevel.h"
+#include "iscsi-test.h"
+
+int T0341_compareandwrite_mismatch(const char *initiator, const char *url, int data_loss, int show_info)
+{ 
+	struct iscsi_context *iscsi;
+	struct scsi_task *task;
+	struct scsi_readcapacity16 *rc16;
+	int ret, i, lun;
+	uint32_t block_size;
+	uint64_t num_blocks;
+	unsigned char data[512 * 256];
+
+	printf("0341_compareandwrite_mismatch:\n");
+	printf("===================\n");
+	if (show_info) {
+		printf("Test COMPAREANDWRITE can detect a data mismatch.\n");
+		printf("1, Verify we detect a mismatch in the first 1-255 blocks of the LUN.\n");
+		printf("2, Verify we detect a mismatch in the last 1-255 blocks of the LUN.\n");
+		printf("\n");
+		return 0;
+	}
+
+	iscsi = iscsi_context_login(initiator, url, &lun);
+	if (iscsi == NULL) {
+		printf("Failed to login to target\n");
+		return -1;
+	}
+
+	/* find the size of the LUN */
+	task = iscsi_readcapacity16_sync(iscsi, lun);
+	if (task == NULL) {
+		printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		goto finished;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+	rc16 = scsi_datain_unmarshall(task);
+	if (rc16 == NULL) {
+		printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+	block_size = rc16->block_length;
+	num_blocks = rc16->returned_lba;
+	scsi_free_scsi_task(task);
+
+
+	if (!data_loss) {
+		printf("--dataloss flag is not set. Skipping test\n");
+		ret = -1;
+		goto finished;
+	}
+	
+
+	ret = 0;
+
+
+	/* write the first 1 - 255 blocks at the start of the LUN */
+	printf("Compare and write first 1-255 blocks (data is not matching) ... ");
+	for (i = 1; i < 256; i++) {
+		task = iscsi_read16_sync(iscsi, lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send READ16 command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test2;
+		}
+		if (task->status != SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("READ16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+
+		if (task->datain.data == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to access DATA-IN buffer %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		memcpy(data, task->datain.data, i * block_size);
+
+		/* flip some bits */
+		data[ (i - 1) * block_size] ^= 0xa5;
+
+		task = iscsi_compareandwrite_sync(iscsi, lun, 0, data, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test2;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE successful. It should have failed with MISCOMPARE/MISCOMPARE_DURING_VERIFY\n");
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		if (task->status    != SCSI_STATUS_CHECK_CONDITION
+		|| task->sense.key  != SCSI_SENSE_MISCOMPARE
+		|| task->sense.ascq != SCSI_SENSE_ASCQ_MISCOMPARE_DURING_VERIFY) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE Failed with the wrong sense : %s(0x%02x)/%s(0x%04x). It should have failed with MISCOMPARE/MISCOMPARE_DURING_VERIFY\n", scsi_sense_key_str(task->sense.key), task->sense.key, scsi_sense_ascq_str(task->sense.ascq), task->sense.ascq);
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+
+test2:
+	/* write the last 1 - 255 blocks at the end of the LUN */
+	printf("Compare and write last 1-255 blocks ... ");
+	for (i = 1; i < 256; i++) {
+		task = iscsi_read16_sync(iscsi, lun, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send READ16 command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test3;
+		}
+		if (task->status != SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("READ16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+
+		if (task->datain.data == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to access DATA-IN buffer %s\n", iscsi_get_error(iscsi));
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		memcpy(data, task->datain.data, i * block_size);
+
+		/* flip some bits */
+		data[ (i - 1) * block_size] ^= 0xa5;
+
+		task = iscsi_compareandwrite_sync(iscsi, lun, num_blocks + 1 - i, data, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test3;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE successful. It should have failed with MISCOMPARE/MISCOMPARE_DURING_VERIFY\n");
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		if (task->status    != SCSI_STATUS_CHECK_CONDITION
+		|| task->sense.key  != SCSI_SENSE_MISCOMPARE
+		|| task->sense.ascq != SCSI_SENSE_ASCQ_MISCOMPARE_DURING_VERIFY) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE Failed with the wrong sense : %s(0x%02x)/%s(0x%04x). It should have failed with MISCOMPARE/MISCOMPARE_DURING_VERIFY\n", scsi_sense_key_str(task->sense.key), task->sense.key, scsi_sense_ascq_str(task->sense.ascq), task->sense.ascq);
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+test3:
+
+finished:
+	iscsi_logout_sync(iscsi);
+	iscsi_destroy_context(iscsi);
+	return ret;
+}
diff --git a/test-tool/0343_compareandwrite_beyondeol.c b/test-tool/0343_compareandwrite_beyondeol.c
new file mode 100644
index 0000000..e830b33
--- /dev/null
+++ b/test-tool/0343_compareandwrite_beyondeol.c
@@ -0,0 +1,189 @@
+/* 
+   Copyright (C) 2012 by Ronnie Sahlberg <ronniesahlberg@gmail.com>
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
+#include "iscsi.h"
+#include "scsi-lowlevel.h"
+#include "iscsi-test.h"
+
+int T0343_compareandwrite_beyondeol(const char *initiator, const char *url, int data_loss, int show_info)
+{ 
+	struct iscsi_context *iscsi;
+	struct scsi_task *task;
+	struct scsi_readcapacity16 *rc16;
+	int ret, i, lun;
+	uint32_t block_size;
+	uint64_t num_blocks;
+	unsigned char data[258 * 512];
+
+	printf("0343_compareandwrite_beyond_eol:\n");
+	printf("=======================\n");
+	if (show_info) {
+		printf("Test that COMPAREANDWRITE fails if writing beyond end-of-lun.\n");
+		printf("1, Writing 1-256 blocks with one block beyond end-of-lun should fail.\n");
+		printf("2, Writing 1-256 blocks at LBA 2^63 should fail.\n");
+		printf("3, Writing 1-256 blocks at LBA -1 should fail.\n");
+		printf("4, Writing 1-256 blocks all but one block beyond eol\n");
+		printf("\n");
+		return 0;
+	}
+
+	iscsi = iscsi_context_login(initiator, url, &lun);
+	if (iscsi == NULL) {
+		printf("Failed to login to target\n");
+		return -1;
+	}
+
+	/* find the size of the LUN */
+	task = iscsi_readcapacity16_sync(iscsi, lun);
+	if (task == NULL) {
+		printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		goto finished;
+	}
+	if (task->status != SCSI_STATUS_GOOD) {
+		printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+	rc16 = scsi_datain_unmarshall(task);
+	if (rc16 == NULL) {
+		printf("failed to unmarshall READCAPACITY10 data. %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+	block_size = rc16->block_length;
+	num_blocks = rc16->returned_lba;
+	scsi_free_scsi_task(task);
+
+	if (!data_loss) {
+		printf("--dataloss flag is not set. Skipping test\n");
+		ret = -1;
+		goto finished;
+	}
+
+
+	ret = 0;
+
+	/* read 1 - 256 blocks beyond the end of the device */
+	printf("Writing 1-256 blocks with one block beyond end-of-device ... ");
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_compareandwrite_sync(iscsi, lun, num_blocks + 2 - i, data, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test2;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE command should fail when writing beyond end of device\n");
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+test2:
+
+	/* read 1 - 256 blocks at lba 2^63 */
+	printf("Writing 1-256 blocks at LBA 2^63 ... ");
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_compareandwrite_sync(iscsi, lun, 0x8000000000000000, data, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test3;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE command should fail when writing beyond end of device\n");
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+test3:
+
+	/* read 1 - 256 blocks at lba -1 */
+	printf("Writing 1-256 blocks at LBA -1 ... ");
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_compareandwrite_sync(iscsi, lun, 0xffffffffffffffff, data, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
+			ret++;
+			goto test4;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE command should fail when writing beyond end of device\n");
+			ret++;
+			scsi_free_scsi_task(task);
+			goto test4;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+test4:
+	/* read 2-256 blocks, all but one block beyond the eol */
+	printf("Writing 1-255 blocks beyond eol starting at last block ... ");
+	for (i=2; i<=256; i++) {
+		task = iscsi_compareandwrite_sync(iscsi, lun, num_blocks, data, i * block_size, block_size, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+			printf("[FAILED]\n");
+			printf("Failed to send COMPAREANDWRITE command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test5;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+			printf("[FAILED]\n");
+			printf("COMPAREANDWRITE beyond end-of-lun did not return sense.\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test5;
+		}
+		if (task->status        != SCSI_STATUS_CHECK_CONDITION
+		    || task->sense.key  != SCSI_SENSE_ILLEGAL_REQUEST
+		    || task->sense.ascq != SCSI_SENSE_ASCQ_LBA_OUT_OF_RANGE) {
+		        printf("[FAILED]\n");
+			printf("COMPAREANDWRITE failed but ascq was wrong. Should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE.\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test5;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+
+test5:
+
+finished:
+	iscsi_logout_sync(iscsi);
+	iscsi_destroy_context(iscsi);
+	return ret;
+}
diff --git a/test-tool/iscsi-test.c b/test-tool/iscsi-test.c
index c4e65c5..16123c2 100644
--- a/test-tool/iscsi-test.c
+++ b/test-tool/iscsi-test.c
@@ -157,6 +157,11 @@ struct scsi_test tests[] = {
 { "T0331_writeverify16_wrprotect",	T0331_writeverify16_wrprotect },
 { "T0334_writeverify16_beyondeol",	T0334_writeverify16_beyondeol },
 
+/* compareandwrite*/
+{ "T0340_compareandwrite_simple",	T0340_compareandwrite_simple },
+{ "T0341_compareandwrite_mismatch",	T0341_compareandwrite_mismatch },
+{ "T0343_compareandwrite_beyondeol",	T0343_compareandwrite_beyondeol },
+
 { NULL, NULL }
 };
 
diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h
index abc6854..062e0bb 100644
--- a/test-tool/iscsi-test.h
+++ b/test-tool/iscsi-test.h
@@ -114,3 +114,7 @@ int T0324_writeverify12_beyondeol(const char *initiator, const char *url, int da
 int T0330_writeverify16_simple(const char *initiator, const char *url, int data_loss, int show_info);
 int T0331_writeverify16_wrprotect(const char *initiator, const char *url, int data_loss, int show_info);
 int T0334_writeverify16_beyondeol(const char *initiator, const char *url, int data_loss, int show_info);
+
+int T0340_compareandwrite_simple(const char *initiator, const char *url, int data_loss, int show_info);
+int T0341_compareandwrite_mismatch(const char *initiator, const char *url, int data_loss, int show_info);
+int T0343_compareandwrite_beyondeol(const char *initiator, const char *url, int data_loss, int show_info);