diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 9d34d7ea..8ef8176a 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -610,7 +610,7 @@ int zmq::socket_base_t::connect (const char *addr_)
             while (isalnum  (*check)
                 || isxdigit (*check)
                 || *check == '.' || *check == '-' || *check == ':'|| *check == ';'
-                || *check == ']')
+                || *check == '[' || *check == ']')
                 check++;
         }
         //  Assume the worst, now look for success
diff --git a/tests/test_reqrep_tcp.cpp b/tests/test_reqrep_tcp.cpp
index ecdf2537..7baca689 100644
--- a/tests/test_reqrep_tcp.cpp
+++ b/tests/test_reqrep_tcp.cpp
@@ -88,7 +88,7 @@ void test_multi_connect_ipv4 (void)
     assert (rc == 0);
     rc = zmq_connect (sc, "tcp://127.0.0.1:5561");
     assert (rc == 0);
-    rc = zmq_connect (sc, "tcp://127.0.0.1:5562");
+    rc = zmq_connect (sc, "tcp://127.0.0.1:5564;127.0.0.1:5562");
     assert (rc == 0);
 
     bounce (sb0, sc);
@@ -101,7 +101,7 @@ void test_multi_connect_ipv4 (void)
 
     rc = zmq_disconnect (sc, "tcp://127.0.0.1:5560");
     assert (rc == 0);
-    rc = zmq_disconnect (sc, "tcp://127.0.0.1:5562");
+    rc = zmq_disconnect (sc, "tcp://127.0.0.1:5564;127.0.0.1:5562");
     assert (rc == 0);
     rc = zmq_disconnect (sc, "tcp://127.0.0.1:5561");
     assert (rc == 0);
@@ -214,7 +214,7 @@ void test_multi_connect_ipv6 (void)
     assert (rc == 0);
     rc = zmq_connect (sc, "tcp://[::1]:5561");
     assert (rc == 0);
-    rc = zmq_connect (sc, "tcp://[::1]:5562");
+    rc = zmq_connect (sc, "tcp://[::1]:5564;[::1]:5562");
     assert (rc == 0);
 
     bounce (sb0, sc);
@@ -227,7 +227,7 @@ void test_multi_connect_ipv6 (void)
 
     rc = zmq_disconnect (sc, "tcp://[::1]:5560");
     assert (rc == 0);
-    rc = zmq_disconnect (sc, "tcp://[::1]:5562");
+    rc = zmq_disconnect (sc, "tcp://[::1]:5564;[::1]:5562");
     assert (rc == 0);
     rc = zmq_disconnect (sc, "tcp://[::1]:5561");
     assert (rc == 0);