diff --git a/test-tool/0102_read10_0blocks.c b/test-tool/0102_read10_0blocks.c
index 924fb5e..8f86c92 100644
--- a/test-tool/0102_read10_0blocks.c
+++ b/test-tool/0102_read10_0blocks.c
@@ -70,7 +70,7 @@ int T0102_read10_0blocks(const char *initiator, const char *url)
 		printf("LUN is too big, skipping test\n");
 		goto finished;
 	}
-	task = iscsi_read10_sync(iscsi, lun, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0);
+	task = iscsi_read10_sync(iscsi, lun, num_blocks + 2, 0, block_size, 0, 0, 0, 0, 0);
 	if (task == NULL) {
 	        printf("[FAILED]\n");
 		printf("Failed to send READ10 command: %s\n", iscsi_get_error(iscsi));
diff --git a/test-tool/0184_writesame10_0blocks.c b/test-tool/0184_writesame10_0blocks.c
index 4d484c9..d7e35a7 100644
--- a/test-tool/0184_writesame10_0blocks.c
+++ b/test-tool/0184_writesame10_0blocks.c
@@ -91,7 +91,7 @@ int T0184_writesame10_0blocks(const char *initiator, const char *url)
 		printf("LUN is too big, skipping test\n");
 		goto finished;
 	}
-	task = iscsi_writesame10_sync(iscsi, lun, num_blocks + 1,
+	task = iscsi_writesame10_sync(iscsi, lun, num_blocks + 2,
 				      buf, block_size,
 				      0,
 				      0, 0, 0, 0);
diff --git a/test-tool/0194_writesame16_0blocks.c b/test-tool/0194_writesame16_0blocks.c
index fbf47ac..944ba4e 100644
--- a/test-tool/0194_writesame16_0blocks.c
+++ b/test-tool/0194_writesame16_0blocks.c
@@ -86,7 +86,7 @@ int T0194_writesame16_0blocks(const char *initiator, const char *url)
 
 
 	printf("Writesame16 0blocks at one block beyond <end-of-LUN> ... ");
-	task = iscsi_writesame16_sync(iscsi, lun, num_blocks + 1,
+	task = iscsi_writesame16_sync(iscsi, lun, num_blocks + 2,
 				      buf, block_size,
 				      0,
 				      0, 0, 0, 0);
diff --git a/test-tool/0203_read16_0blocks.c b/test-tool/0203_read16_0blocks.c
index cae7984..8d21c49 100644
--- a/test-tool/0203_read16_0blocks.c
+++ b/test-tool/0203_read16_0blocks.c
@@ -65,7 +65,7 @@ int T0203_read16_0blocks(const char *initiator, const char *url)
 
 
 	printf("READ16 0blocks at LBA:<beyond end-of-disk> ... ");
-	task = iscsi_read16_sync(iscsi, lun, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0);
+	task = iscsi_read16_sync(iscsi, lun, num_blocks + 2, 0, 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));
diff --git a/test-tool/0213_read12_0blocks.c b/test-tool/0213_read12_0blocks.c
index 0685626..529b7c5 100644
--- a/test-tool/0213_read12_0blocks.c
+++ b/test-tool/0213_read12_0blocks.c
@@ -71,7 +71,7 @@ int T0213_read12_0blocks(const char *initiator, const char *url)
 		printf("LUN is too big, skipping test\n");
 		goto finished;
 	}
-	task = iscsi_read12_sync(iscsi, lun, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0);
+	task = iscsi_read12_sync(iscsi, lun, num_blocks + 2, 0, block_size, 0, 0, 0, 0, 0);
 	if (task == NULL) {
 	        printf("[FAILED]\n");
 		printf("Failed to send READ12 command: %s\n", iscsi_get_error(iscsi));
diff --git a/test-tool/0233_write12_0blocks.c b/test-tool/0233_write12_0blocks.c
index 14882af..8bf4c5a 100644
--- a/test-tool/0233_write12_0blocks.c
+++ b/test-tool/0233_write12_0blocks.c
@@ -77,7 +77,7 @@ int T0233_write12_0blocks(const char *initiator, const char *url)
 		printf("LUN is too big, skipping test\n");
 		goto finished;
 	}
-	task = iscsi_write12_sync(iscsi, lun, num_blocks + 1, NULL, 0, block_size, 0, 0, 0, 0, 0);
+	task = iscsi_write12_sync(iscsi, lun, num_blocks + 2, NULL, 0, block_size, 0, 0, 0, 0, 0);
 	if (task == NULL) {
 	        printf("[FAILED]\n");
 		printf("Failed to send WRITE12 command: %s\n", iscsi_get_error(iscsi));
diff --git a/test-tool/0243_prefetch10_0blocks.c b/test-tool/0243_prefetch10_0blocks.c
index 9b7c930..3811716 100644
--- a/test-tool/0243_prefetch10_0blocks.c
+++ b/test-tool/0243_prefetch10_0blocks.c
@@ -63,7 +63,7 @@ int T0243_prefetch10_0blocks(const char *initiator, const char *url)
 		printf("LUN is too big, skipping test\n");
 		goto finished;
 	}
-	ret = prefetch10_lbaoutofrange(iscsi, lun, num_blocks + 1, 0, 0, 0);
+	ret = prefetch10_lbaoutofrange(iscsi, lun, num_blocks + 2, 0, 0, 0);
 	if (ret != 0) {
 		goto finished;
 	}
diff --git a/test-tool/0253_prefetch16_0blocks.c b/test-tool/0253_prefetch16_0blocks.c
index faa25b3..1feeb8b 100644
--- a/test-tool/0253_prefetch16_0blocks.c
+++ b/test-tool/0253_prefetch16_0blocks.c
@@ -56,7 +56,7 @@ int T0253_prefetch16_0blocks(const char *initiator, const char *url)
 
 	/* Prefetch 0 blocks beyond end of the LUN */
 	printf("PREFETCH16 0blocks at one block beyond <end-of-LUN>.\n");
-	ret = prefetch16_lbaoutofrange(iscsi, lun, num_blocks + 1, 0, 0, 0);
+	ret = prefetch16_lbaoutofrange(iscsi, lun, num_blocks + 2, 0, 0, 0);
 	if (ret != 0) {
 		goto finished;
 	}
diff --git a/test-tool/0293_write10_0blocks.c b/test-tool/0293_write10_0blocks.c
index 9b6aaea..9f32ef1 100644
--- a/test-tool/0293_write10_0blocks.c
+++ b/test-tool/0293_write10_0blocks.c
@@ -77,7 +77,7 @@ int T0293_write10_0blocks(const char *initiator, const char *url)
 		printf("LUN is too big, skipping test\n");
 		goto finished;
 	}
-	task = iscsi_write10_sync(iscsi, lun, num_blocks + 1, NULL, 0, block_size, 0, 0, 0, 0, 0);
+	task = iscsi_write10_sync(iscsi, lun, num_blocks + 2, NULL, 0, block_size, 0, 0, 0, 0, 0);
 	if (task == NULL) {
 	        printf("[FAILED]\n");
 		printf("Failed to send WRITE10 command: %s\n", iscsi_get_error(iscsi));