diff --git a/test-tool/test_get_lba_status_beyond_eol.c b/test-tool/test_get_lba_status_beyond_eol.c
index 75d17ed..202fbfa 100644
--- a/test-tool/test_get_lba_status_beyond_eol.c
+++ b/test-tool/test_get_lba_status_beyond_eol.c
@@ -42,11 +42,11 @@ test_get_lba_status_beyond_eol(void)
 
 	logging(LOG_VERBOSE, "Test GET_LBA_STATUS at LBA 2^63");
 
-	ret = get_lba_status_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000, 24);
+	ret = get_lba_status_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL, 24);
 	CU_ASSERT_EQUAL(ret, 0);
 
 	logging(LOG_VERBOSE, "Test GET_LBA_STATUS at LBA -1");
 
-	ret = get_lba_status_lbaoutofrange(iscsic, tgt_lun, 0xffffffffffffffff, 24);
+	ret = get_lba_status_lbaoutofrange(iscsic, tgt_lun, 0xffffffffffffffffULL, 24);
 	CU_ASSERT_EQUAL(ret, 0);
 }
diff --git a/test-tool/test_orwrite_0blocks.c b/test-tool/test_orwrite_0blocks.c
index 5e4d118..e3151c1 100644
--- a/test-tool/test_orwrite_0blocks.c
+++ b/test-tool/test_orwrite_0blocks.c
@@ -51,7 +51,7 @@ test_orwrite_0blocks(void)
 
 
 	logging(LOG_VERBOSE, "Test ORWRITE 0-blocks at LBA==2^63");
-	ret = orwrite_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000,
+	ret = orwrite_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL,
 				    0, block_size,
 				    0, 0, 0, 0, 0, NULL);
 	CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_orwrite_beyond_eol.c b/test-tool/test_orwrite_beyond_eol.c
index 72fe2ab..6cbc907 100644
--- a/test-tool/test_orwrite_beyond_eol.c
+++ b/test-tool/test_orwrite_beyond_eol.c
@@ -59,7 +59,7 @@ test_orwrite_beyond_eol(void)
 			break;
 		}
 		ret = orwrite_lbaoutofrange(iscsic, tgt_lun,
-					    0x8000000000000000,
+					    0x8000000000000000ULL,
 					    i * block_size, block_size,
 					    0, 0, 0, 0, 0, buf);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_prefetch16_0blocks.c b/test-tool/test_prefetch16_0blocks.c
index e55d13d..905cd78 100644
--- a/test-tool/test_prefetch16_0blocks.c
+++ b/test-tool/test_prefetch16_0blocks.c
@@ -46,7 +46,7 @@ test_prefetch16_0blocks(void)
 
 
 	logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks at LBA==2^63");
-	ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000,
+	ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL,
 				       0, 0, 0);
 	CU_ASSERT_EQUAL(ret, 0);
 
diff --git a/test-tool/test_prefetch16_beyond_eol.c b/test-tool/test_prefetch16_beyond_eol.c
index d74489d..43b5751 100644
--- a/test-tool/test_prefetch16_beyond_eol.c
+++ b/test-tool/test_prefetch16_beyond_eol.c
@@ -45,7 +45,7 @@ test_prefetch16_beyond_eol(void)
 
 	logging(LOG_VERBOSE, "Test PREFETCH16 1-256 blocks at LBA==2^63");
 	for (i = 1; i <= 256; i++) {
-		ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000,
+		ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL,
 					       i, 0, 0);
 		CU_ASSERT_EQUAL(ret, 0);
 	}
diff --git a/test-tool/test_read16_0blocks.c b/test-tool/test_read16_0blocks.c
index 6f257e1..9541136 100644
--- a/test-tool/test_read16_0blocks.c
+++ b/test-tool/test_read16_0blocks.c
@@ -48,7 +48,7 @@ test_read16_0blocks(void)
 
 
 	logging(LOG_VERBOSE, "Test READ16 0-blocks at LBA==2^63");
-	ret = read16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000, 0,
+	ret = read16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL, 0,
 				   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 4a910bb..b488513 100644
--- a/test-tool/test_read16_beyond_eol.c
+++ b/test-tool/test_read16_beyond_eol.c
@@ -67,7 +67,7 @@ test_read16_beyond_eol(void)
 			break;
 		}
 
-		ret = read16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000,
+		ret = read16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, NULL);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_verify16_0blocks.c b/test-tool/test_verify16_0blocks.c
index 0abf23a..ccc344c 100644
--- a/test-tool/test_verify16_0blocks.c
+++ b/test-tool/test_verify16_0blocks.c
@@ -46,7 +46,7 @@ test_verify16_0blocks(void)
 
 
 	logging(LOG_VERBOSE, "Test VERIFY16 0-blocks at LBA==2^63");
-	ret = verify16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000, 0,
+	ret = verify16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL, 0,
 				   block_size, 0, 0, 1, NULL);
 	CU_ASSERT_EQUAL(ret, 0);
 
diff --git a/test-tool/test_verify16_beyond_eol.c b/test-tool/test_verify16_beyond_eol.c
index 9989fd0..d105834 100644
--- a/test-tool/test_verify16_beyond_eol.c
+++ b/test-tool/test_verify16_beyond_eol.c
@@ -57,7 +57,7 @@ test_verify16_beyond_eol(void)
 			break;
 		}
 
-		ret = verify16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000,
+		ret = verify16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL,
 					   i * block_size, block_size,
 					   0, 0, 1, buf);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_write16_0blocks.c b/test-tool/test_write16_0blocks.c
index 4a07cc0..fde3006 100644
--- a/test-tool/test_write16_0blocks.c
+++ b/test-tool/test_write16_0blocks.c
@@ -49,7 +49,7 @@ test_write16_0blocks(void)
 
 
 	logging(LOG_VERBOSE, "Test WRITE16 0-blocks at LBA==2^63");
-	ret = write16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000, 0,
+	ret = write16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL, 0,
 				    block_size, 0, 0, 0, 0, 0, NULL);
 	CU_ASSERT_EQUAL(ret, 0);
 
diff --git a/test-tool/test_write16_beyond_eol.c b/test-tool/test_write16_beyond_eol.c
index 77d5080..7b16327 100644
--- a/test-tool/test_write16_beyond_eol.c
+++ b/test-tool/test_write16_beyond_eol.c
@@ -59,7 +59,7 @@ test_write16_beyond_eol(void)
 		if (maximum_transfer_length && maximum_transfer_length < i) {
 			break;
 		}
-		ret = write16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000,
+		ret = write16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL,
 					   i * block_size, block_size,
 					   0, 0, 0, 0, 0, buf);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_writesame16_0blocks.c b/test-tool/test_writesame16_0blocks.c
index b1f8388..3223f6b 100644
--- a/test-tool/test_writesame16_0blocks.c
+++ b/test-tool/test_writesame16_0blocks.c
@@ -61,7 +61,7 @@ test_writesame16_0blocks(void)
 
 
 	logging(LOG_VERBOSE, "Test WRITESAME16 0-blocks at LBA==2^63");
-	ret = writesame16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000,
+	ret = writesame16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL,
 					block_size, inq_bl->wsnz,
 					0, 0, 0, 0, NULL);
 	CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_writesame16_beyond_eol.c b/test-tool/test_writesame16_beyond_eol.c
index 85914b2..ca5dfb7 100644
--- a/test-tool/test_writesame16_beyond_eol.c
+++ b/test-tool/test_writesame16_beyond_eol.c
@@ -52,7 +52,7 @@ test_writesame16_beyond_eol(void)
 
 	logging(LOG_VERBOSE, "Test WRITESAME16 1-256 blocks at LBA==2^63");
 	for (i = 1; i <= 256; i++) {
-		ret = writesame16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000,
+		ret = writesame16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL,
 						block_size, i,
 						0, 0, 0, 0, buf);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_writeverify16_0blocks.c b/test-tool/test_writeverify16_0blocks.c
index 07adf51..d2b7780 100644
--- a/test-tool/test_writeverify16_0blocks.c
+++ b/test-tool/test_writeverify16_0blocks.c
@@ -51,7 +51,7 @@ test_writeverify16_0blocks(void)
 
 
 	logging(LOG_VERBOSE, "Test WRITEVERIFY16 0-blocks at LBA==2^63");
-	ret = writeverify16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000,
+	ret = writeverify16_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL,
 					  0, block_size,
 					  0, 0, 0, 0, NULL);
 	CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_writeverify16_beyond_eol.c b/test-tool/test_writeverify16_beyond_eol.c
index 62e6515..a1db917 100644
--- a/test-tool/test_writeverify16_beyond_eol.c
+++ b/test-tool/test_writeverify16_beyond_eol.c
@@ -61,7 +61,7 @@ test_writeverify16_beyond_eol(void)
 		}
 
 		ret = writeverify16_lbaoutofrange(iscsic, tgt_lun,
-						  0x8000000000000000,
+						  0x8000000000000000ULL,
 						  i * block_size, block_size,
 						  0, 0, 0, 0, buf);
 		CU_ASSERT_EQUAL(ret, 0);