diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27c2050c..5e47a998 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -622,6 +622,7 @@ set(tests
         test_timeo
         test_many_sockets
         test_diffserv
+	test_connect_rid
 )
 if(NOT WIN32)
 list(APPEND tests
diff --git a/tests/test_connect_rid.cpp b/tests/test_connect_rid.cpp
new file mode 100644
index 00000000..0b4e914f
--- /dev/null
+++ b/tests/test_connect_rid.cpp
@@ -0,0 +1,136 @@
+
+/*
+    Copyright (c) 2007-2014 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "testutil.hpp"
+
+
+void test_stream_2_stream(void* ctx){
+    void *rbind, *rconn1;
+    int ret;
+    char buff[256];
+    char msg[] = "hi 1";
+    const char *bindip = "tcp://127.0.0.1:12001";
+    rbind = zmq_socket(ctx,ZMQ_STREAM);
+    rconn1 = zmq_socket(ctx,ZMQ_STREAM);
+    assert(rbind && rconn1 );
+    ret = zmq_bind(rbind,bindip);
+    assert(0 == ret);
+    ret = zmq_setsockopt(rconn1,ZMQ_CONNECT_RID,"conn1",6);
+    assert(0 == ret);
+    ret = zmq_connect(rconn1,bindip);
+    /*test duplicate connect attempt*/
+    ret = zmq_setsockopt(rconn1,ZMQ_CONNECT_RID,"conn1",6);
+    assert(0 == ret);
+    ret = zmq_connect(rconn1,bindip);
+    assert(0 == ret);
+    ret = zmq_send(rconn1,"conn1",6,ZMQ_SNDMORE);
+    assert(6 == ret);
+    ret = zmq_send(rconn1,msg,5,0);
+    assert(5 == ret);
+
+    ret = zmq_recv(rbind,buff,256,0);
+    assert(ret && 0 == buff[0]);
+    ret = zmq_recv(rbind,buff,256,0);
+    assert(0 == ret);
+
+    // close the duplicate socket
+    ret = zmq_recv(rbind,buff,256,0);
+    assert(ret && 0 == buff[0]);
+    ret = zmq_recv(rbind,buff+128,128,0);
+    assert(0 == ret);
+    // handle the good socket
+    ret = zmq_recv(rbind,buff,256,0);
+    assert(ret && 0 == buff[0]);
+    ret = zmq_recv(rbind,buff+128,128,0);
+    assert(5 == ret && 'h' == buff[128] );
+    zmq_unbind(rbind,bindip);
+    zmq_close(rbind);
+    zmq_close(rconn1);
+
+}
+void test_router_2_router(void* ctx,bool named){
+    void *rbind, *rconn1;
+    int ret;
+    char buff[256];
+    char msg[] = "hi 1";
+    const char *bindip = "tcp://127.0.0.1:12001";
+    rbind = zmq_socket(ctx,ZMQ_ROUTER);
+    rconn1 = zmq_socket(ctx,ZMQ_ROUTER);
+    assert(rbind && rconn1 );
+    ret = zmq_bind(rbind,bindip);
+    assert(0 == ret);
+    if(named){/*here we check if this interferes with bound socket naming */
+        ret = zmq_setsockopt (rbind, ZMQ_IDENTITY, "X", 1);
+        ret = zmq_setsockopt (rconn1, ZMQ_IDENTITY, "Y", 1);
+    }
+    ret = zmq_setsockopt(rconn1,ZMQ_CONNECT_RID,"conn1",6);
+    assert(0 == ret);
+    ret = zmq_connect(rconn1,bindip);
+    assert(0 == ret);
+    /*test duplicate connect attempt*/
+    ret = zmq_setsockopt(rconn1,ZMQ_CONNECT_RID,"conn1",6);
+    assert(0 == ret);
+    ret = zmq_connect(rconn1,bindip);
+    assert(0 == ret);
+    ret = zmq_send(rconn1,"conn1",6,ZMQ_SNDMORE);
+    assert(6 == ret);
+    ret = zmq_send(rconn1,msg,5,0);
+    assert(5 == ret);
+
+    ret = zmq_recv(rbind,buff,256,0);
+    if(named) assert(ret && 'Y' == buff[0]);
+    else assert(ret && 0 == buff[0]);
+    ret = zmq_recv(rbind,buff+128,128,0);
+    assert(5 == ret && 'h' == buff[128] );
+    if(named) {
+        ret = zmq_send(rbind,buff,1,ZMQ_SNDMORE);
+        assert(1 == ret);
+    }
+    else {
+        ret = zmq_send(rbind,buff,5,ZMQ_SNDMORE);
+        assert(5 == ret);
+    }
+    ret = zmq_send_const(rbind,"ok",3,0);
+    assert(3 == ret);
+    
+    /*if bound socket identity naming a problem, we'll likely see something funky here */
+    ret = zmq_recv(rconn1,buff,256,0);
+    assert('c' == buff[0] && 6 == ret);
+    ret = zmq_recv(rconn1,buff+128,128,0);
+    assert(3 == ret && 'o' == buff[128] );
+
+    zmq_unbind(rbind,bindip);
+    zmq_close(rbind);
+    zmq_close(rconn1);
+}
+
+int main (void)
+{
+    void *ctx; 
+    setup_test_environment();
+    ctx = zmq_ctx_new ();
+    assert (ctx);
+    test_stream_2_stream(ctx);
+    test_router_2_router(ctx,false);
+    test_router_2_router(ctx,true);
+    zmq_ctx_destroy(ctx);
+    printf ("'test_connect_rid' passed");
+    return 0;
+}