diff --git a/Makefile.am b/Makefile.am
index 6f92c1d..a7021c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,9 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \
 	test-tool/0160_readcapacity16_simple.c \
 	test-tool/0170_unmap_simple.c test-tool/0171_unmap_zero.c \
 	test-tool/0180_writesame10_unmap.c test-tool/0181_writesame10_unmap_unaligned.c \
+	test-tool/0182_writesame10_beyondeol.c \
 	test-tool/0190_writesame16_unmap.c test-tool/0191_writesame16_unmap_unaligned.c \
+	test-tool/0192_writesame16_beyondeol.c \
 	test-tool/0200_read16_simple.c test-tool/0201_read16_rdprotect.c \
 	test-tool/0202_read16_flags.c  test-tool/0203_read16_0blocks.c   \
 	test-tool/0204_read16_beyondeol.c  \
diff --git a/test-tool/0182_writesame10_beyondeol.c b/test-tool/0182_writesame10_beyondeol.c
new file mode 100644
index 0000000..f98399f
--- /dev/null
+++ b/test-tool/0182_writesame10_beyondeol.c
@@ -0,0 +1,196 @@
+/* 
+   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 T0182_writesame10_beyondeol(const char *initiator, const char *url, int data_loss _U_, 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;
+	char buf[512];
+
+	printf("0182_writesame10_beyondeol:\n");
+	printf("=======================\n");
+	if (show_info) {
+		printf("Test that WRITESAME10 fails if writing beyond end-of-lun.\n");
+		printf("1, Write 1-256 blocks one block beyond end-of-lun.\n");
+		printf("2, Write 1-256 blocks at LBA 2^31 (only on LUNs < 2TB)\n");
+		printf("3, Write 1-256 blocks at LBA -1 (only on LUN < 2TB)\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;
+
+
+	/* write 1 - 256 blocks beyond the end of the device */
+	printf("Writing 1-256 blocks beyond end-of-device ... ");
+	for (i = 2; i <= 257; i++) {
+		task = iscsi_writesame10_sync(iscsi, lun, buf, block_size,
+			num_blocks, i, 0, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send WRITESAME10 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test2;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("WRITESAME10 command should fail when writing beyond end of device\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		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("WRITESAME10 failed but with the wrong sense code. It should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE.\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+
+test2:
+	/* writing 1 - 256 blocks at LBA 2^31 */
+	printf("Writing 1-256 blocks at LBA 2^31 ... ");
+	if (num_blocks > 0x80000000) {
+		printf("LUN is too big, skipping test\n");
+		goto test3;
+	}
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_writesame10_sync(iscsi, lun, buf, block_size,
+			0x80000000, i, 0, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send WRITESAME10 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test3;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("WRITESAME10 command should fail when writing at LBA 2^63\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		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("WRITESAME10 failed but with the wrong sense code. It should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE.\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+
+test3:
+	/* write 1 - 256 blocks at LBA -1 */
+	printf("Writing 1-256 blocks at LBA -1 ... ");
+	if (num_blocks > 0x80000000) {
+		printf("LUN is too big, skipping test\n");
+		goto test4;
+	}
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_writesame10_sync(iscsi, lun, buf, block_size,
+			-1, i, 0, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send WRITESAME10 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test4;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("WRITESAME10 command should fail when reading at LBA -1\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test4;
+		}
+		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("WRITESAME10 failed but with the wrong sense code. It should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE.\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test4;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+
+test4:
+
+finished:
+	iscsi_logout_sync(iscsi);
+	iscsi_destroy_context(iscsi);
+	return ret;
+}
diff --git a/test-tool/0192_writesame16_beyondeol.c b/test-tool/0192_writesame16_beyondeol.c
new file mode 100644
index 0000000..f6f9b43
--- /dev/null
+++ b/test-tool/0192_writesame16_beyondeol.c
@@ -0,0 +1,187 @@
+/* 
+   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 T0192_writesame16_beyondeol(const char *initiator, const char *url, int data_loss _U_, 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;
+	char buf[512];
+
+	printf("0192_writesame16_beyondeol:\n");
+	printf("=======================\n");
+	if (show_info) {
+		printf("Test that WRITESAME16 fails if writing beyond end-of-lun.\n");
+		printf("1, Write 1-256 blocks one block beyond end-of-lun.\n");
+		printf("2, Write 1-256 blocks at LBA 2^63\n");
+		printf("3, Write 1-256 blocks at LBA -1\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;
+
+	/* write 1 - 256 blocks beyond the end of the device */
+	printf("Writing 1-256 blocks beyond end-of-device ... ");
+	for (i = 2; i <= 257; i++) {
+		task = iscsi_writesame16_sync(iscsi, lun, buf, block_size,
+			num_blocks, i, 0, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test2;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("WRITESAME16 command should fail when writing beyond end of device\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		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("WRITESAME16 failed but with the wrong sense code. It should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE.\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test2;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+
+test2:
+	/* writing 1 - 256 blocks at LBA 2^63 */
+	printf("Writing 1-256 blocks at LBA 2^63 ... ");
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_writesame16_sync(iscsi, lun, buf, block_size,
+			0x8000000000000000ULL, i, 0, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test3;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("WRITESAME16 command should fail when writing at LBA 2^63\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		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("WRITESAME16 failed but with the wrong sense code. It should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE.\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test3;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+
+test3:
+	/* write 1 - 256 blocks at LBA -1 */
+	printf("Writing 1-256 blocks at LBA -1 ... ");
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_writesame16_sync(iscsi, lun, buf, block_size,
+			-1, i, 0, 0, 0, 0, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send WRITESAME16 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test4;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("WRITESAME16 command should fail when reading at LBA -1\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test4;
+		}
+		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("WRITESAME16 failed but with the wrong sense code. It should have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE.\n");
+			ret = -1;
+			scsi_free_scsi_task(task);
+			goto test4;
+		}
+		scsi_free_scsi_task(task);
+	}
+	printf("[OK]\n");
+
+
+test4:
+
+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 d2f4ccf..b98a2b6 100644
--- a/test-tool/iscsi-test.c
+++ b/test-tool/iscsi-test.c
@@ -71,10 +71,12 @@ struct scsi_test tests[] = {
 /* writesame10*/
 { "T0180_writesame10_unmap",		T0180_writesame10_unmap },
 { "T0181_writesame10_unmap_unaligned",	T0181_writesame10_unmap_unaligned },
+{ "T0182_writesame10_beyondeol",	T0182_writesame10_beyondeol },
 
 /* writesame16*/
 { "T0190_writesame16_unmap",		T0190_writesame16_unmap },
 { "T0191_writesame16_unmap_unaligned",	T0191_writesame16_unmap_unaligned },
+{ "T0192_writesame16_beyondeol",	T0192_writesame16_beyondeol },
 
 /* read16*/
 { "T0200_read16_simple",		T0200_read16_simple },
diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h
index c750063..b3c2fb2 100644
--- a/test-tool/iscsi-test.h
+++ b/test-tool/iscsi-test.h
@@ -44,9 +44,11 @@ int T0171_unmap_zero(const char *initiator, const char *url, int data_loss, int
 
 int T0180_writesame10_unmap(const char *initiator, const char *url, int data_loss, int show_info);
 int T0181_writesame10_unmap_unaligned(const char *initiator, const char *url, int data_loss, int show_info);
+int T0182_writesame10_beyondeol(const char *initiator, const char *url, int data_loss, int show_info);
 
 int T0190_writesame16_unmap(const char *initiator, const char *url, int data_loss, int show_info);
 int T0191_writesame16_unmap_unaligned(const char *initiator, const char *url, int data_loss, int show_info);
+int T0192_writesame16_beyondeol(const char *initiator, const char *url, int data_loss, int show_info);
 
 int T0200_read16_simple(const char *initiator, const char *url, int data_loss, int show_info);
 int T0201_read16_rdprotect(const char *initiator, const char *url, int data_loss, int show_info);