diff --git a/tests/test_connect_delay.cpp b/tests/test_connect_delay.cpp
index 67ae04cd..b9f06bf4 100644
--- a/tests/test_connect_delay.cpp
+++ b/tests/test_connect_delay.cpp
@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "../include/zmq.h"
 
-static void *server (void *c)
+static void *server (void *)
 {
     void *socket, *context;
     char buffer[16];
@@ -88,7 +88,7 @@ static void *server (void *c)
     pthread_exit(NULL);
 }
 
-static void *worker (void *n)
+static void *worker (void *)
 {
     void *socket, *context;
     int rc, hadone, val;
@@ -131,7 +131,7 @@ static void *worker (void *n)
     pthread_exit(NULL);
 }
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_connect_delay running...\n");
     int val;
diff --git a/tests/test_connect_resolve.cpp b/tests/test_connect_resolve.cpp
index 64c99e18..b2b25b06 100644
--- a/tests/test_connect_resolve.cpp
+++ b/tests/test_connect_resolve.cpp
@@ -25,7 +25,7 @@
 
 #include "../include/zmq.h"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_connect_resolve running...\n");
 
diff --git a/tests/test_hwm.cpp b/tests/test_hwm.cpp
index d887b312..aa41e841 100644
--- a/tests/test_hwm.cpp
+++ b/tests/test_hwm.cpp
@@ -24,7 +24,7 @@
 
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_hwm running...\n");
 
diff --git a/tests/test_invalid_rep.cpp b/tests/test_invalid_rep.cpp
index 316800d1..e74e705f 100644
--- a/tests/test_invalid_rep.cpp
+++ b/tests/test_invalid_rep.cpp
@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_invalid_rep running...\n");
 
diff --git a/tests/test_last_endpoint.cpp b/tests/test_last_endpoint.cpp
index e6accc34..f476a63b 100644
--- a/tests/test_last_endpoint.cpp
+++ b/tests/test_last_endpoint.cpp
@@ -35,7 +35,7 @@ static void do_bind_and_verify (void *s, const char *endpoint)
     assert (rc == 0 && strcmp (test, endpoint) == 0);
 }
 
-int main (int argc, char *argv [])
+int main (void)
 {
     //  Create the infrastructure
     void *ctx = zmq_init (1);
diff --git a/tests/test_msg_flags.cpp b/tests/test_msg_flags.cpp
index 8f653e2d..34c10019 100644
--- a/tests/test_msg_flags.cpp
+++ b/tests/test_msg_flags.cpp
@@ -24,7 +24,7 @@
 
 #include "../include/zmq.h"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     //  Create the infrastructure
     void *ctx = zmq_init (0);
diff --git a/tests/test_pair_inproc.cpp b/tests/test_pair_inproc.cpp
index 6705cc56..dbccf33c 100644
--- a/tests/test_pair_inproc.cpp
+++ b/tests/test_pair_inproc.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_pair_inproc running...\n");
 
diff --git a/tests/test_pair_ipc.cpp b/tests/test_pair_ipc.cpp
index 96a265ff..b9bad5df 100644
--- a/tests/test_pair_ipc.cpp
+++ b/tests/test_pair_ipc.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_pair_ipc running...\n");
 
diff --git a/tests/test_pair_tcp.cpp b/tests/test_pair_tcp.cpp
index 464be5a0..c0ce5c56 100644
--- a/tests/test_pair_tcp.cpp
+++ b/tests/test_pair_tcp.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_pair_tcp running...\n");
 
diff --git a/tests/test_reqrep_device.cpp b/tests/test_reqrep_device.cpp
index e562560d..1e05df4e 100644
--- a/tests/test_reqrep_device.cpp
+++ b/tests/test_reqrep_device.cpp
@@ -25,7 +25,7 @@
 
 #include "../include/zmq.h"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_reqrep_device running...\n");
 
diff --git a/tests/test_reqrep_inproc.cpp b/tests/test_reqrep_inproc.cpp
index f710968a..126e860a 100644
--- a/tests/test_reqrep_inproc.cpp
+++ b/tests/test_reqrep_inproc.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_reqrep_inproc running...\n");
 
diff --git a/tests/test_reqrep_ipc.cpp b/tests/test_reqrep_ipc.cpp
index fd9b28df..57dc442c 100644
--- a/tests/test_reqrep_ipc.cpp
+++ b/tests/test_reqrep_ipc.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_reqrep_ipc running...\n");
 
diff --git a/tests/test_reqrep_tcp.cpp b/tests/test_reqrep_tcp.cpp
index 1e6bbbbd..3cdd0a2d 100644
--- a/tests/test_reqrep_tcp.cpp
+++ b/tests/test_reqrep_tcp.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_reqrep_tcp running...\n");
 
diff --git a/tests/test_router_behavior.cpp b/tests/test_router_behavior.cpp
index c201abeb..9fd90721 100644
--- a/tests/test_router_behavior.cpp
+++ b/tests/test_router_behavior.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_router_behavior running...\n");
 
diff --git a/tests/test_shutdown_stress.cpp b/tests/test_shutdown_stress.cpp
index 811637c1..2d99afcd 100644
--- a/tests/test_shutdown_stress.cpp
+++ b/tests/test_shutdown_stress.cpp
@@ -44,7 +44,7 @@ extern "C"
     }
 }
 
-int main (int argc, char *argv [])
+int main (void)
 {
     void *ctx;
     void *s1;
diff --git a/tests/test_sub_forward.cpp b/tests/test_sub_forward.cpp
index 36a7f4a2..9e4fd133 100644
--- a/tests/test_sub_forward.cpp
+++ b/tests/test_sub_forward.cpp
@@ -25,7 +25,7 @@
 #include "../include/zmq.h"
 #include "../include/zmq_utils.h"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_sub_forward running...\n");
 
diff --git a/tests/test_term_endpoint.cpp b/tests/test_term_endpoint.cpp
index 6e501d73..533446a0 100644
--- a/tests/test_term_endpoint.cpp
+++ b/tests/test_term_endpoint.cpp
@@ -6,7 +6,7 @@
 #include "../include/zmq_utils.h"
 
 
-int main (int argc, char *argv [])
+int main (void)
 {
     int rc;
     char buf[32];
diff --git a/tests/test_timeo.cpp b/tests/test_timeo.cpp
index e5ce0ac5..4d58af72 100644
--- a/tests/test_timeo.cpp
+++ b/tests/test_timeo.cpp
@@ -44,7 +44,7 @@ extern "C"
     }
 }
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_timeo running...\n");