diff --git a/Makefile.am b/Makefile.am
index 83e44c5..8c357ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,7 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \
 	test-tool/0234_write12_beyondeol.c \
 	test-tool/0240_prefetch10_simple.c \
 	test-tool/0250_prefetch16_simple.c \
-	test-tool/0260_get_lba_status_simple.c
+	test-tool/0260_get_lba_status_simple.c test-tool/0264_get_lba_status_beyondeol.c
 endif
 
 # LD_PRELOAD library.
diff --git a/test-tool/0264_get_lba_status_beyondeol.c b/test-tool/0264_get_lba_status_beyondeol.c
new file mode 100644
index 0000000..a68c10a
--- /dev/null
+++ b/test-tool/0264_get_lba_status_beyondeol.c
@@ -0,0 +1,105 @@
+/* 
+   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 T0264_get_lba_status_beyondeol(const char *initiator, const char *url)
+{ 
+	struct iscsi_context *iscsi;
+	struct scsi_task *task;
+	struct scsi_readcapacity16 *rc16;
+	int ret, i, lun;
+	uint32_t block_size;
+	uint64_t num_blocks;
+
+	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("Readcapacity 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;
+	}
+
+	if (rc16->lbpme == 0){
+		printf("Logical unit is fully provisioned. Skipping test\n");
+		ret = -1;
+		scsi_free_scsi_task(task);
+		goto finished;
+	}
+
+	block_size = rc16->block_length;
+	num_blocks = rc16->returned_lba;
+
+	scsi_free_scsi_task(task);
+
+	ret = 0;
+
+	/* try reading one descriptor beyond end-of-device */
+	printf("Read one descriptor beyond end-of-device ... ");
+	task = iscsi_get_lba_status_sync(iscsi, lun, num_blocks + 1, 8 + 16);
+	if (task == NULL) {
+	        printf("[FAILED]\n");
+		printf("Failed to send GET_LBA_STATUS command: %s\n", iscsi_get_error(iscsi));
+		ret = -1;
+		goto finished;
+	}
+	if (task->status == SCSI_STATUS_GOOD) {
+	        printf("[FAILED]\n");
+		printf("GET_LBA_STATUS beyond eol should fail with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE\n");
+		ret = -1;
+		scsi_free_scsi_task(task);
+		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("GET_LBA_STATUS 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 finished;
+	}
+	scsi_free_scsi_task(task);
+	printf("[OK]\n");
+
+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 bb570dc..b85bbfe 100644
--- a/test-tool/iscsi-test.c
+++ b/test-tool/iscsi-test.c
@@ -110,6 +110,7 @@ struct scsi_test tests[] = {
 
 /* get_lba_status */
 { "T0260_get_lba_status_simple",	T0260_get_lba_status_simple },
+{ "T0264_get_lba_status_beyondeol",	T0264_get_lba_status_beyondeol },
 
 { NULL, NULL }
 };
diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h
index 33c47b2..8fbfbfd 100644
--- a/test-tool/iscsi-test.h
+++ b/test-tool/iscsi-test.h
@@ -79,3 +79,4 @@ int T0240_prefetch10_simple(const char *initiator, const char *url);
 int T0250_prefetch16_simple(const char *initiator, const char *url);
 
 int T0260_get_lba_status_simple(const char *initiator, const char *url);
+int T0264_get_lba_status_beyondeol(const char *initiator, const char *url);