diff --git a/test-tool/test_writeatomic16_0blocks.c b/test-tool/test_writeatomic16_0blocks.c
index 9ffe7c8..1c948f8 100644
--- a/test-tool/test_writeatomic16_0blocks.c
+++ b/test-tool/test_writeatomic16_0blocks.c
@@ -26,12 +26,13 @@
 void
 test_writeatomic16_0blocks(void)
 {
-	int ret;
+	int align, ret;
 
 	CHECK_FOR_DATALOSS;
 	CHECK_FOR_SBC;
 
 	logging(LOG_VERBOSE, LOG_BLANK_LINE);
+	align = inq_bl->atomic_align ? inq_bl->atomic_align : 1;
 	logging(LOG_VERBOSE, "Test WRITEATOMIC16 0-blocks at LBA==0");
 	ret = writeatomic16(sd, 0, 0, block_size,
 			    0, 0, 0, 0, NULL,
@@ -44,7 +45,7 @@ test_writeatomic16_0blocks(void)
 	CU_ASSERT_EQUAL(ret, 0);
 
 	logging(LOG_VERBOSE, "Test WRITEATOMIC16 0-blocks one alignment past end-of-LUN");
-	ret = writeatomic16(sd, num_blocks + inq_bl->atomic_align, 0,
+	ret = writeatomic16(sd, num_blocks + align, 0,
 			    block_size, 0, 0, 0, 0, NULL,
 			    EXPECT_LBA_OOB);
 	CU_ASSERT_EQUAL(ret, 0);
@@ -58,7 +59,7 @@ test_writeatomic16_0blocks(void)
 
 
 	logging(LOG_VERBOSE, "Test WRITEATOMIC16 0-blocks at LBA==-<alignment>");
-	ret = writeatomic16(sd, -inq_bl->atomic_align, 0, block_size,
+	ret = writeatomic16(sd, -align, 0, block_size,
 			    0, 0, 0, 0, NULL,
 			    EXPECT_LBA_OOB);
 	CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_writeatomic16_beyond_eol.c b/test-tool/test_writeatomic16_beyond_eol.c
index fc48f13..c4a2d12 100644
--- a/test-tool/test_writeatomic16_beyond_eol.c
+++ b/test-tool/test_writeatomic16_beyond_eol.c
@@ -28,7 +28,7 @@
 void
 test_writeatomic16_beyond_eol(void)
 {
-	int i, gran, ret;
+	int align, i, gran, ret;
 	unsigned char *buf = alloca(256 * 2 * block_size);
 
 
@@ -37,6 +37,7 @@ test_writeatomic16_beyond_eol(void)
 
 	logging(LOG_VERBOSE, LOG_BLANK_LINE);
 
+	align = inq_bl->atomic_align ? inq_bl->atomic_align : 1;
 	gran = inq_bl->atomic_gran ? inq_bl->atomic_gran : 1;
 	ret = writeatomic16(sd, 0,
 			    block_size * gran,
@@ -51,7 +52,7 @@ test_writeatomic16_beyond_eol(void)
 
 	logging(LOG_VERBOSE, "Test WRITEATOMIC16 1-256 blocks <granularity> blocks beyond the end");
 	memset(buf, 0xa6, 256 * block_size);
-	for (i = inq_bl->atomic_gran; i <= 256; i += inq_bl->atomic_gran) {
+	for (i = gran; i <= 256; i += gran) {
 		if (maximum_transfer_length && maximum_transfer_length < i) {
 			break;
 		}
@@ -64,7 +65,7 @@ test_writeatomic16_beyond_eol(void)
 	}
 
 	logging(LOG_VERBOSE, "Test WRITEATOMIC16 1-256 blocks at LBA==2^63");
-	for (i = inq_bl->atomic_gran; i <= 256; i += inq_bl->atomic_gran) {
+	for (i = gran; i <= 256; i += gran) {
 		if (maximum_transfer_length && maximum_transfer_length < i) {
 			break;
 		}
@@ -76,11 +77,11 @@ test_writeatomic16_beyond_eol(void)
 
 
 	logging(LOG_VERBOSE, "Test WRITEATOMIC16 1-256 blocks at LBA==-<alignment>");
-	for (i = inq_bl->atomic_gran; i <= 256; i += inq_bl->atomic_gran) {
+	for (i = gran; i <= 256; i += gran) {
 		if (maximum_transfer_length && maximum_transfer_length < i) {
 			break;
 		}
-		ret = writeatomic16(sd, -inq_bl->atomic_align, i * block_size,
+		ret = writeatomic16(sd, -align, i * block_size,
 				    block_size, 0, 0, 0, 0, buf,
 				    EXPECT_LBA_OOB);
 		CU_ASSERT_EQUAL(ret, 0);
@@ -88,11 +89,11 @@ test_writeatomic16_beyond_eol(void)
 
 
 	logging(LOG_VERBOSE, "Test WRITEATOMIC16 2-256 blocks all but one block beyond the end");
-	for (i = 2 * inq_bl->atomic_gran; i <= 256; i += inq_bl->atomic_gran) {
+	for (i = 2 * gran; i <= 256; i += gran) {
 		if (maximum_transfer_length && maximum_transfer_length < i) {
 			break;
 		}
-		ret = writeatomic16(sd, num_blocks - inq_bl->atomic_gran,
+		ret = writeatomic16(sd, num_blocks - gran,
 				    i * block_size, block_size, 0, 0, 0, 0, buf,
 				    EXPECT_LBA_OOB);
 		CU_ASSERT_EQUAL(ret, 0);
diff --git a/test-tool/test_writeatomic16_simple.c b/test-tool/test_writeatomic16_simple.c
index 4308b22..9995cab 100644
--- a/test-tool/test_writeatomic16_simple.c
+++ b/test-tool/test_writeatomic16_simple.c
@@ -53,7 +53,7 @@ test_writeatomic16_simple(void)
 
 	logging(LOG_VERBOSE, "Test WRITEATOMIC16 of 1-256 blocks at the start of the LUN");
 	memset(buf, 0xa6, 256 * block_size);
-	for (i = inq_bl->atomic_gran; i <= 256; i += inq_bl->atomic_gran) {
+	for (i = gran; i <= 256; i += gran) {
 		if (maximum_transfer_length && maximum_transfer_length < i) {
 			break;
 		}
@@ -64,7 +64,7 @@ test_writeatomic16_simple(void)
 	}
 
 	logging(LOG_VERBOSE, "Test WRITEATOMIC16 of 1-256 blocks at the end of the LUN");
-	for (i = inq_bl->atomic_gran; i <= 256; i += inq_bl->atomic_gran) {
+	for (i = gran; i <= 256; i += gran) {
 		if (maximum_transfer_length && maximum_transfer_length < i) {
 			break;
 		}