diff --git a/Makefile.am b/Makefile.am
index 0d67913..1e331ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,8 +88,10 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \
 	test-tool/0234_write12_beyondeol.c \
 	test-tool/0240_prefetch10_simple.c \
 	test-tool/0241_prefetch10_flags.c \
+	test-tool/0242_prefetch10_beyondeol.c \
 	test-tool/0250_prefetch16_simple.c \
 	test-tool/0251_prefetch16_flags.c \
+	test-tool/0252_prefetch16_beyondeol.c \
 	test-tool/0260_get_lba_status_simple.c test-tool/0264_get_lba_status_beyondeol.c \
 	test-tool/0270_verify16_simple.c test-tool/0271_verify16_mismatch.c \
 	test-tool/0272_verify16_mismatch_no_cmp.c test-tool/0273_verify16_beyondeol.c \
diff --git a/test-tool/0242_prefetch10_beyondeol.c b/test-tool/0242_prefetch10_beyondeol.c
new file mode 100644
index 0000000..362f18c
--- /dev/null
+++ b/test-tool/0242_prefetch10_beyondeol.c
@@ -0,0 +1,218 @@
+/* 
+   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 T0242_prefetch10_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;
+	uint64_t num_blocks;
+
+	printf("0242_prefetch10_beyondeol:\n");
+	printf("===================\n");
+	if (show_info) {
+		printf("Test PREFETCH10 for blocks beyond the EOL.\n");
+		printf("1, Prefetch 1-256 blocks one block beyond end-of-lun.\n");
+		printf("2, Prefetch 1-256 blocks at LBA 2^31 (only on LUNs < 1TB)\n");
+		printf("3, Prefetch 1-256 blocks at LBA -1 (only on LUN < 2TB)\n");
+		printf("4, Prefetch 2-256 blocks all but one beyond end-of-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;
+	}
+	num_blocks = rc16->returned_lba;
+	scsi_free_scsi_task(task);
+
+	ret = 0;
+
+
+
+	/* prefetch 1-256 blocks, one block beyond the end-of-lun */
+	printf("Prefetch last 1-256 blocks one block beyond eol ... ");
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_prefetch10_sync(iscsi, lun, num_blocks + 2 - i, i, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send prefetch10 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test2;
+		}
+		if (task->status    == SCSI_STATUS_CHECK_CONDITION
+		&& task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+		&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+			printf("[SKIPPED]\n");
+			printf("Opcode is not implemented on target\n");
+			scsi_free_scsi_task(task);
+			ret = -2;
+			goto finished;
+		}
+		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("PREFETCH10 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:
+	/* Prefetch 1 - 256 blocks at LBA 2^31 */
+	printf("Prefetch 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_prefetch10_sync(iscsi, lun, 0x80000000, i, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send PREFETCH10 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test3;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("PREFETCH10 command should fail for LBA 2^31\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("PREFETCH10 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:
+	/* prefetch 1 - 256 blocks at LBA -1 */
+	printf("Prefetch 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_prefetch10_sync(iscsi, lun, -1, i, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send PREFETCH10 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test4;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("PREFETCH10 command should fail for 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("PREFETCH10 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:
+	/* prefetch 2-256 blocks, all but one block beyond the eol */
+	printf("Prefetch 1-255 blocks beyond eol starting at last block ... ");
+	for (i=2; i<=256; i++) {
+		task = iscsi_prefetch10_sync(iscsi, lun, num_blocks, i, 0, 0);
+		if (task == NULL) {
+			printf("[FAILED]\n");
+			printf("Failed to send PREFETCH10 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test5;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+			printf("[FAILED]\n");
+			printf("PREFETCH10 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("PREFETCH10 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/0252_prefetch16_beyondeol.c b/test-tool/0252_prefetch16_beyondeol.c
new file mode 100644
index 0000000..cffe9e4
--- /dev/null
+++ b/test-tool/0252_prefetch16_beyondeol.c
@@ -0,0 +1,209 @@
+/* 
+   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 T0252_prefetch16_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;
+	uint64_t num_blocks;
+
+	printf("0252_prefetch16_beyondeol:\n");
+	printf("===================\n");
+	if (show_info) {
+		printf("Test PREFETCH16 for blocks beyond the EOL.\n");
+		printf("1, Prefetch 1-256 blocks one block beyond end-of-lun.\n");
+		printf("2, Prefetch 1-256 blocks at LBA 2^63 should fail.\n");
+		printf("3, Prefetch 1-256 blocks at LBA -1 should fail.\n");
+		printf("4, Prefetch 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 READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+	num_blocks = rc16->returned_lba;
+	scsi_free_scsi_task(task);
+
+	ret = 0;
+
+
+
+	/* prefetch 1-256 blocks, one block beyond the end-of-lun */
+	printf("Prefetch last 1-256 blocks one block beyond eol ... ");
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_prefetch16_sync(iscsi, lun, num_blocks + 2 - i, i, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send prefetch16 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test2;
+		}
+		if (task->status    == SCSI_STATUS_CHECK_CONDITION
+		&& task->sense.key  == SCSI_SENSE_ILLEGAL_REQUEST
+		&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
+			printf("[SKIPPED]\n");
+			printf("Opcode is not implemented on target\n");
+			scsi_free_scsi_task(task);
+			ret = -2;
+			goto finished;
+		}
+		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("PREFETCH16 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:
+	/* Prefetch 1 - 256 blocks at LBA 2^63 */
+	printf("Prefetch 1-256 blocks at LBA 2^63 ... ");
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_prefetch16_sync(iscsi, lun, 0x8000000000000000, i, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send PREFETCH16 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test3;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("PREFETCH16 command should fail for LBA 2^31\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("PREFETCH16 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:
+	/* prefetch 1 - 256 blocks at LBA -1 */
+	for (i = 1; i <= 256; i++) {
+		task = iscsi_prefetch16_sync(iscsi, lun, -1, i, 0, 0);
+		if (task == NULL) {
+		        printf("[FAILED]\n");
+			printf("Failed to send PREFETCH16 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test4;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+		        printf("[FAILED]\n");
+			printf("PREFETCH16 command should fail for 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("PREFETCH16 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:
+	/* prefetch 2-256 blocks, all but one block beyond the eol */
+	printf("Prefetch 1-255 blocks beyond eol starting at last block ... ");
+	for (i=2; i<=256; i++) {
+		task = iscsi_prefetch16_sync(iscsi, lun, num_blocks, i, 0, 0);
+		if (task == NULL) {
+			printf("[FAILED]\n");
+			printf("Failed to send PREFETCH16 command: %s\n", iscsi_get_error(iscsi));
+			ret = -1;
+			goto test5;
+		}
+		if (task->status == SCSI_STATUS_GOOD) {
+			printf("[FAILED]\n");
+			printf("PREFETCH16 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("PREFETCH16 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 b5f7fb9..e3f44fd 100644
--- a/test-tool/iscsi-test.c
+++ b/test-tool/iscsi-test.c
@@ -120,10 +120,12 @@ struct scsi_test tests[] = {
 /* prefetch10*/
 { "T0240_prefetch10_simple",		T0240_prefetch10_simple },
 { "T0241_prefetch10_flags",		T0241_prefetch10_flags },
+{ "T0242_prefetch10_beyondeol",		T0242_prefetch10_beyondeol },
 
 /* prefetch16*/
 { "T0250_prefetch16_simple",		T0250_prefetch16_simple },
 { "T0251_prefetch16_flags",		T0251_prefetch16_flags },
+{ "T0252_prefetch16_beyondeol",		T0252_prefetch16_beyondeol },
 
 /* get_lba_status */
 { "T0260_get_lba_status_simple",	T0260_get_lba_status_simple },
diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h
index 28cf9ce..8ed4bde 100644
--- a/test-tool/iscsi-test.h
+++ b/test-tool/iscsi-test.h
@@ -90,9 +90,11 @@ int T0234_write12_beyondeol(const char *initiator, const char *url, int data_los
 
 int T0240_prefetch10_simple(const char *initiator, const char *url, int data_loss, int show_info);
 int T0241_prefetch10_flags(const char *initiator, const char *url, int data_loss, int show_info);
+int T0242_prefetch10_beyondeol(const char *initiator, const char *url, int data_loss, int show_info);
 
 int T0250_prefetch16_simple(const char *initiator, const char *url, int data_loss, int show_info);
 int T0251_prefetch16_flags(const char *initiator, const char *url, int data_loss, int show_info);
+int T0252_prefetch16_beyondeol(const char *initiator, const char *url, int data_loss, int show_info);
 
 int T0260_get_lba_status_simple(const char *initiator, const char *url, int data_loss, int show_info);
 int T0264_get_lba_status_beyondeol(const char *initiator, const char *url, int data_loss, int show_info);