diff --git a/test-tool/test_read6_beyond_eol.c b/test-tool/test_read6_beyond_eol.c
index 1bd6e64..e4ac0e2 100644
--- a/test-tool/test_read6_beyond_eol.c
+++ b/test-tool/test_read6_beyond_eol.c
@@ -29,7 +29,7 @@ test_read6_beyond_eol(void)
 { 
 	int i, ret;
 
-	if (num_blocks >= 0x1fffff) {
+	if (num_blocks > 0x1fffff) {
 		CU_PASS("LUN is too big for read-beyond-eol tests with READ6. Skipping test.\n");
 		return;
 	}
diff --git a/test-tool/test_read6_simple.c b/test-tool/test_read6_simple.c
index fafc7d5..fd25195 100644
--- a/test-tool/test_read6_simple.c
+++ b/test-tool/test_read6_simple.c
@@ -46,7 +46,7 @@ test_read6_simple(void)
 
 
 	logging(LOG_VERBOSE, "Test READ6 of 1-255 blocks at the end of the LUN");
-	if (num_blocks >= 0x1fffff) {
+	if (num_blocks > 0x200000) {
 		CU_PASS("LUN is too big for read-at-eol tests with READ6. Skipping test.\n");
 	} else {
 		for (i = 1; i <= 255; i++) {