diff --git a/test-tool/test_read10_beyond_eol.c b/test-tool/test_read10_beyond_eol.c
index 80ec331..1fe4752 100644
--- a/test-tool/test_read10_beyond_eol.c
+++ b/test-tool/test_read10_beyond_eol.c
@@ -37,7 +37,7 @@ test_read10_beyond_eol(void)
 	logging(LOG_VERBOSE, "");
 	logging(LOG_VERBOSE, "Test READ10 1-256 blocks one block beyond the end");
 	for (i = 1; i <= 256; i++) {
-		ret = read10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = read10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, NULL);
 		CU_ASSERT_EQUAL(ret, 0);
@@ -63,7 +63,7 @@ test_read10_beyond_eol(void)
 
 	logging(LOG_VERBOSE, "Test READ10 2-256 blocks all but one block beyond the end");
 	for (i = 2; i <= 256; i++) {
-		ret = read10_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = read10_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, NULL);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_read12_beyond_eol.c b/test-tool/test_read12_beyond_eol.c
index 4f0bb31..fe9d5cd 100644
--- a/test-tool/test_read12_beyond_eol.c
+++ b/test-tool/test_read12_beyond_eol.c
@@ -37,7 +37,7 @@ test_read12_beyond_eol(void)
 	logging(LOG_VERBOSE, "");
 	logging(LOG_VERBOSE, "Test READ12 1-256 blocks one block beyond the end");
 	for (i = 1; i <= 256; i++) {
-		ret = read12_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = read12_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, NULL);
 		CU_ASSERT_EQUAL(ret, 0);
@@ -63,7 +63,7 @@ test_read12_beyond_eol(void)
 
 	logging(LOG_VERBOSE, "Test READ12 2-256 blocks all but one block beyond the end");
 	for (i = 2; i <= 256; i++) {
-		ret = read12_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = read12_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, NULL);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_read16_beyond_eol.c b/test-tool/test_read16_beyond_eol.c
index 0fcc5e7..287ded6 100644
--- a/test-tool/test_read16_beyond_eol.c
+++ b/test-tool/test_read16_beyond_eol.c
@@ -34,7 +34,7 @@ test_read16_beyond_eol(void)
 	logging(LOG_VERBOSE, "");
 	logging(LOG_VERBOSE, "Test READ16 1-256 blocks one block beyond the end");
 	for (i = 1; i <= 256; i++) {
-		ret = read16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = read16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, NULL);
 		CU_ASSERT_EQUAL(ret, 0);
@@ -60,7 +60,7 @@ test_read16_beyond_eol(void)
 
 	logging(LOG_VERBOSE, "Test READ16 2-256 blocks all but one block beyond the end");
 	for (i = 2; i <= 256; i++) {
-		ret = read16_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = read16_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, NULL);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_read6_beyond_eol.c b/test-tool/test_read6_beyond_eol.c
index efa7f59..5db7de2 100644
--- a/test-tool/test_read6_beyond_eol.c
+++ b/test-tool/test_read6_beyond_eol.c
@@ -38,7 +38,7 @@ test_read6_beyond_eol(void)
 	logging(LOG_VERBOSE, "");
 	logging(LOG_VERBOSE, "Test READ6 1-255 blocks one block beyond the end");
 	for (i = 1; i <= 255; i++) {
-		ret = read6_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = read6_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					  i * block_size, block_size,
 					  NULL);
 		CU_ASSERT_EQUAL(ret, 0);
@@ -56,7 +56,7 @@ test_read6_beyond_eol(void)
 
 	logging(LOG_VERBOSE, "Test READ6 2-255 blocks all but one block beyond the end");
 	for (i = 2; i <= 255; i++) {
-		ret = read6_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = read6_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					  i * block_size, block_size,
 					  NULL);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_verify10_beyond_eol.c b/test-tool/test_verify10_beyond_eol.c
index 470336f..76487ab 100644
--- a/test-tool/test_verify10_beyond_eol.c
+++ b/test-tool/test_verify10_beyond_eol.c
@@ -39,7 +39,7 @@ test_verify10_beyond_eol(void)
 	for (i = 1; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = verify10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = verify10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					   i * block_size, block_size,
 					   0, 0, 1, buf);
 		free(buf);
@@ -74,7 +74,7 @@ test_verify10_beyond_eol(void)
 	for (i = 2; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = verify10_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = verify10_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					   i * block_size, block_size,
 					   0, 0, 1, buf);
 		free(buf);
diff --git a/test-tool/test_verify12_beyond_eol.c b/test-tool/test_verify12_beyond_eol.c
index 8165108..31ae2c3 100644
--- a/test-tool/test_verify12_beyond_eol.c
+++ b/test-tool/test_verify12_beyond_eol.c
@@ -39,7 +39,7 @@ test_verify12_beyond_eol(void)
 	for (i = 1; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = verify12_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = verify12_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					   i * block_size, block_size,
 					   0, 0, 1, buf);
 		free(buf);
@@ -74,7 +74,7 @@ test_verify12_beyond_eol(void)
 	for (i = 2; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = verify12_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = verify12_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					   i * block_size, block_size,
 					   0, 0, 1, buf);
 		free(buf);
diff --git a/test-tool/test_verify16_beyond_eol.c b/test-tool/test_verify16_beyond_eol.c
index 22d0c24..d273237 100644
--- a/test-tool/test_verify16_beyond_eol.c
+++ b/test-tool/test_verify16_beyond_eol.c
@@ -34,7 +34,7 @@ test_verify16_beyond_eol(void)
 	for (i = 1; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = verify16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = verify16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					   i * block_size, block_size,
 					   0, 0, 1, buf);
 		free(buf);
@@ -69,7 +69,7 @@ test_verify16_beyond_eol(void)
 	for (i = 2; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = verify16_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = verify16_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					   i * block_size, block_size,
 					   0, 0, 1, buf);
 		free(buf);
diff --git a/test-tool/test_write10_beyond_eol.c b/test-tool/test_write10_beyond_eol.c
index eee7c02..832e885 100644
--- a/test-tool/test_write10_beyond_eol.c
+++ b/test-tool/test_write10_beyond_eol.c
@@ -41,7 +41,7 @@ test_write10_beyond_eol(void)
 	for (i = 1; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = write10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = write10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, buf);
 		free(buf);
@@ -76,7 +76,7 @@ test_write10_beyond_eol(void)
 	for (i = 2; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = write10_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = write10_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					   i * block_size, block_size,
 					    0, 0, 0, 0, 0, buf);
 		free(buf);
diff --git a/test-tool/test_write12_beyond_eol.c b/test-tool/test_write12_beyond_eol.c
index 931ada2..f5e9ec6 100644
--- a/test-tool/test_write12_beyond_eol.c
+++ b/test-tool/test_write12_beyond_eol.c
@@ -41,7 +41,7 @@ test_write12_beyond_eol(void)
 	for (i = 1; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = write12_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = write12_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, buf);
 		free(buf);
@@ -76,7 +76,7 @@ test_write12_beyond_eol(void)
 	for (i = 2; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = write12_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = write12_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					   i * block_size, block_size,
 					    0, 0, 0, 0, 0, buf);
 		free(buf);
diff --git a/test-tool/test_write16_beyond_eol.c b/test-tool/test_write16_beyond_eol.c
index 324b4a1..65f1eb4 100644
--- a/test-tool/test_write16_beyond_eol.c
+++ b/test-tool/test_write16_beyond_eol.c
@@ -37,7 +37,7 @@ test_write16_beyond_eol(void)
 	for (i = 1; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = write16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 2 - i,
+		ret = write16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, buf);
 		free(buf);
@@ -72,7 +72,7 @@ test_write16_beyond_eol(void)
 	for (i = 2; i <= 256; i++) {
 		unsigned char *buf = malloc(block_size * i);
 
-		ret = write16_lbaoutofrange(iscsic, tgt_lun, num_blocks,
+		ret = write16_lbaoutofrange(iscsic, tgt_lun, num_blocks - 1,
 					   i * block_size, block_size,
 					    0, 0, 0, 0, 0, buf);
 		free(buf);