diff --git a/tests/test_req_correlate.cpp b/tests/test_req_correlate.cpp
index 03a17ed8..04dee10c 100644
--- a/tests/test_req_correlate.cpp
+++ b/tests/test_req_correlate.cpp
@@ -41,10 +41,6 @@ void test_req_correlate ()
     TEST_ASSERT_SUCCESS_ERRNO (
       zmq_setsockopt (req, ZMQ_REQ_CORRELATE, &enabled, sizeof (int)));
 
-    int rcvtimeo = 100;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_RCVTIMEO, &rcvtimeo, sizeof (int)));
-
     char my_endpoint[MAX_SOCKET_STRING];
     bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
 
diff --git a/tests/test_req_relaxed.cpp b/tests/test_req_relaxed.cpp
index 3ec31dfa..fc9777fa 100644
--- a/tests/test_req_relaxed.cpp
+++ b/tests/test_req_relaxed.cpp
@@ -56,10 +56,6 @@ void setUp ()
     for (size_t peer = 0; peer < services; peer++) {
         rep[peer] = test_context_socket (ZMQ_REP);
 
-        int timeout = 500;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rep[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
         TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep[peer], my_endpoint));
 
         //  These tests require strict ordering, so wait for the connections to
diff --git a/tests/test_spec_dealer.cpp b/tests/test_spec_dealer.cpp
index 8b9aeb7f..e7b6eb2d 100644
--- a/tests/test_spec_dealer.cpp
+++ b/tests/test_spec_dealer.cpp
@@ -47,10 +47,6 @@ void test_round_robin_out (const char *bind_address_)
     for (size_t peer = 0; peer < services; ++peer) {
         rep[peer] = test_context_socket (ZMQ_REP);
 
-        int timeout = 250;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rep[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
         TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep[peer], connect_address));
     }
 
@@ -82,10 +78,6 @@ void test_fair_queue_in (const char *bind_address_)
 {
     void *receiver = test_context_socket (ZMQ_DEALER);
 
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (receiver, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
     char connect_address[MAX_SOCKET_STRING];
     test_bind (receiver, bind_address_, connect_address,
                sizeof (connect_address));
@@ -95,9 +87,6 @@ void test_fair_queue_in (const char *bind_address_)
     for (size_t peer = 0; peer < services; ++peer) {
         senders[peer] = test_context_socket (ZMQ_DEALER);
 
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (senders[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
         TEST_ASSERT_SUCCESS_ERRNO (
           zmq_connect (senders[peer], connect_address));
     }
diff --git a/tests/test_spec_pushpull.cpp b/tests/test_spec_pushpull.cpp
index 2c31c934..10ad68a2 100644
--- a/tests/test_spec_pushpull.cpp
+++ b/tests/test_spec_pushpull.cpp
@@ -53,9 +53,6 @@ void test_push_round_robin_out (const char *bind_address_)
     for (size_t peer = 0; peer < services; ++peer) {
         pulls[peer] = test_context_socket (ZMQ_PULL);
 
-        int timeout = 250;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (pulls[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
         TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pulls[peer], connect_address));
     }
 
diff --git a/tests/test_spec_rep.cpp b/tests/test_spec_rep.cpp
index a183b0a4..034c2b77 100644
--- a/tests/test_spec_rep.cpp
+++ b/tests/test_spec_rep.cpp
@@ -39,11 +39,6 @@ char connect_address[MAX_SOCKET_STRING];
 void test_fair_queue_in (const char *bind_address_)
 {
     void *rep = test_context_socket (ZMQ_REP);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rep, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
     TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (rep, bind_address_));
     size_t len = MAX_SOCKET_STRING;
     TEST_ASSERT_SUCCESS_ERRNO (
@@ -54,8 +49,6 @@ void test_fair_queue_in (const char *bind_address_)
     for (size_t peer = 0; peer < services; ++peer) {
         reqs[peer] = test_context_socket (ZMQ_REQ);
 
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (reqs[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
         TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (reqs[peer], connect_address));
     }
 
diff --git a/tests/test_spec_req.cpp b/tests/test_spec_req.cpp
index 6df0de81..99d15263 100644
--- a/tests/test_spec_req.cpp
+++ b/tests/test_spec_req.cpp
@@ -48,9 +48,6 @@ void test_round_robin_out (const char *bind_address_)
     for (size_t peer = 0; peer < services; peer++) {
         rep[peer] = test_context_socket (ZMQ_REP);
 
-        int timeout = 250;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rep[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
         TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep[peer], connect_address));
     }
     //  We have to give the connects time to finish otherwise the requests
@@ -88,10 +85,6 @@ void test_req_only_listens_to_current_peer (const char *bind_address_)
     for (size_t i = 0; i < services; ++i) {
         router[i] = test_context_socket (ZMQ_ROUTER);
 
-        int timeout = 250;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (router[i], ZMQ_RCVTIMEO, &timeout, sizeof (timeout)));
-
         int enabled = 1;
         TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
           router[i], ZMQ_ROUTER_MANDATORY, &enabled, sizeof (enabled)));
diff --git a/tests/test_spec_router.cpp b/tests/test_spec_router.cpp
index 869b66eb..9e882f0a 100644
--- a/tests/test_spec_router.cpp
+++ b/tests/test_spec_router.cpp
@@ -41,11 +41,6 @@ void test_fair_queue_in (const char *bind_address_)
 {
     char connect_address[MAX_SOCKET_STRING];
     void *receiver = test_context_socket (ZMQ_ROUTER);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (receiver, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
     TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (receiver, bind_address_));
     size_t len = MAX_SOCKET_STRING;
     TEST_ASSERT_SUCCESS_ERRNO (
@@ -56,9 +51,6 @@ void test_fair_queue_in (const char *bind_address_)
     for (unsigned char peer = 0; peer < services; ++peer) {
         senders[peer] = test_context_socket (ZMQ_DEALER);
 
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (senders[peer], ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
         char *str = strdup ("A");
         str[0] += peer;
         TEST_ASSERT_SUCCESS_ERRNO (