diff --git a/test-tool/iscsi-test-cu.c b/test-tool/iscsi-test-cu.c
index dcbd26e..c88ebe7 100644
--- a/test-tool/iscsi-test-cu.c
+++ b/test-tool/iscsi-test-cu.c
@@ -773,6 +773,7 @@ test_setup(void)
 {
         task = NULL;
         read_write_buf = NULL;
+        local_iscsi_queue_pdu = NULL;
 }
 
 void
diff --git a/test-tool/test_compareandwrite_invalid_dataout_size.c b/test-tool/test_compareandwrite_invalid_dataout_size.c
index b469554..b27b4f8 100644
--- a/test-tool/test_compareandwrite_invalid_dataout_size.c
+++ b/test-tool/test_compareandwrite_invalid_dataout_size.c
@@ -83,5 +83,4 @@ test_compareandwrite_invalid_dataout_size(void)
                         block_size, 0, 0, 0, 0,
                         EXPECT_STATUS_GENERIC_BAD);
 
-        local_iscsi_queue_pdu = NULL;
 }