diff --git a/test-tool/test_writesame10_unmap_unaligned.c b/test-tool/test_writesame10_unmap_unaligned.c
index 35ce236..9085500 100644
--- a/test-tool/test_writesame10_unmap_unaligned.c
+++ b/test-tool/test_writesame10_unmap_unaligned.c
@@ -38,12 +38,12 @@ test_writesame10_unmap_unaligned(void)
 	CHECK_FOR_SBC;
 
 	logging(LOG_VERBOSE, LOG_BLANK_LINE);
-	logging(LOG_VERBOSE, "Test that unaligned WRITESAME10 Unmap fails. LBPPB==%d", lbppb);
+	logging(LOG_VERBOSE, "Test that unaligned WRITESAME10 Unmap succeeds. LBPPB==%d", lbppb);
 	for (i = 1; i < lbppb; i++) {
 		logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10 at LBA:%d", lbppb - i, i);
-		ret = writesame10_invalidfieldincdb(iscsic, tgt_lun, i,
-						    block_size, lbppb - i,
-						    0, 1, 0, 0, buf);
+		ret = writesame10(iscsic, tgt_lun, i,
+				  block_size, lbppb - i,
+				  0, 1, 0, 0, buf);
 		CU_ASSERT_EQUAL(ret, 0);
 	}
 }
diff --git a/test-tool/test_writesame16_unmap_unaligned.c b/test-tool/test_writesame16_unmap_unaligned.c
index d1bc44f..41d8ab5 100644
--- a/test-tool/test_writesame16_unmap_unaligned.c
+++ b/test-tool/test_writesame16_unmap_unaligned.c
@@ -37,13 +37,12 @@ test_writesame16_unmap_unaligned(void)
 	CHECK_FOR_SBC;
 
 	logging(LOG_VERBOSE, LOG_BLANK_LINE);
-	logging(LOG_VERBOSE, "Test that unaligned WRITESAME16 Unmap fails. LBPPB==%d", lbppb);
+	logging(LOG_VERBOSE, "Test that unaligned WRITESAME16 Unmap succeeds. LBPPB==%d", lbppb);
 
 	for (i = 1; i < lbppb; i++) {
 		logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16 at LBA:%d", lbppb - i, i);
-		ret = writesame16_invalidfieldincdb(iscsic, tgt_lun, i,
-						    block_size, lbppb - i,
-						    0, 1, 0, 0, NULL);
+		ret = writesame16(iscsic, tgt_lun, i, 0, lbppb - i,
+				  0, 1, 0, 0, NULL);
 		if (ret == -2) {
 			logging(LOG_NORMAL, "[SKIPPED] WRITESAME16 is not implemented.");
 			CU_PASS("[SKIPPED] Target does not support WRITESAME16. Skipping test");