diff --git a/test-tool/test_async_abort_simple.c b/test-tool/test_async_abort_simple.c
index 5add7ce..7b30478 100644
--- a/test-tool/test_async_abort_simple.c
+++ b/test-tool/test_async_abort_simple.c
@@ -199,10 +199,9 @@ test_async_abort_simple(void)
 		CU_FAIL("unexpected WRITE/ABORT state");
 	}
 
-	scsi_free_scsi_task(state.wtask);
-
 	/* Avoid that callbacks get invoked after this test finished */
-        iscsi_logout_sync(sd->iscsi_ctx);
-        iscsi_destroy_context(sd->iscsi_ctx);
+	iscsi_logout_sync(sd->iscsi_ctx);
+	iscsi_destroy_context(sd->iscsi_ctx);
+	scsi_free_scsi_task(state.wtask);
 	sd->iscsi_ctx = NULL;
 }
diff --git a/test-tool/test_async_lu_reset_simple.c b/test-tool/test_async_lu_reset_simple.c
index 1b7943f..f867708 100644
--- a/test-tool/test_async_lu_reset_simple.c
+++ b/test-tool/test_async_lu_reset_simple.c
@@ -196,10 +196,10 @@ test_async_lu_reset_simple(void)
 	}
 
 out:
-	scsi_free_scsi_task(state.wtask);
 
 	/* Avoid that callbacks get invoked after this test finished */
-        iscsi_logout_sync(sd->iscsi_ctx);
-        iscsi_destroy_context(sd->iscsi_ctx);
+	iscsi_logout_sync(sd->iscsi_ctx);
+	iscsi_destroy_context(sd->iscsi_ctx);
+	scsi_free_scsi_task(state.wtask);
 	sd->iscsi_ctx = NULL;
 }