diff --git a/tests/test_bind_null_fuzzer.cpp b/tests/test_bind_null_fuzzer.cpp
index d4161300..291b9533 100644
--- a/tests/test_bind_null_fuzzer.cpp
+++ b/tests/test_bind_null_fuzzer.cpp
@@ -94,7 +94,7 @@ void test_bind_null_fuzzer ()
 
 int main (int argc, char **argv)
 {
-    setup_test_environment (0);
+    setup_test_environment ();
 
     UNITY_BEGIN ();
     RUN_TEST (test_bind_null_fuzzer);
diff --git a/tests/test_connect_null_fuzzer.cpp b/tests/test_connect_null_fuzzer.cpp
index 4cad08cc..985a2725 100644
--- a/tests/test_connect_null_fuzzer.cpp
+++ b/tests/test_connect_null_fuzzer.cpp
@@ -71,8 +71,10 @@ extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
 
     zmq_msg_t msg;
     zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, client, ZMQ_DONTWAIT))
+    while (-1 != zmq_msg_recv (&msg, client, ZMQ_DONTWAIT)) {
         zmq_msg_close (&msg);
+        zmq_msg_init (&msg);
+    }
 
     close (server_accept);
     close (server);
@@ -106,7 +108,7 @@ void test_connect_null_fuzzer ()
 
 int main (int argc, char **argv)
 {
-    setup_test_environment (0);
+    setup_test_environment ();
 
     UNITY_BEGIN ();
     RUN_TEST (test_connect_null_fuzzer);
diff --git a/tests/test_use_fd.cpp b/tests/test_use_fd.cpp
index f15ffea0..888cf203 100644
--- a/tests/test_use_fd.cpp
+++ b/tests/test_use_fd.cpp
@@ -197,7 +197,7 @@ void test_client_server_ipc ()
 
 int main ()
 {
-    setup_test_environment (0);
+    setup_test_environment ();
 
     UNITY_BEGIN ();
     RUN_TEST (test_req_rep_tcp);