diff --git a/ipc/nano/src/lib.rs b/ipc/nano/src/lib.rs
index da820855d..d1cc58c48 100644
--- a/ipc/nano/src/lib.rs
+++ b/ipc/nano/src/lib.rs
@@ -24,11 +24,11 @@ pub use ipc::*;
 
 use std::sync::*;
 use std::io::{Write, Read};
-use nanomsg::{Socket, Protocol, Error};
+use nanomsg::{Socket, Protocol, Error, Endpoint};
 
 pub struct Worker<S> where S: IpcInterface<S> {
 	service: Arc<S>,
-	sockets: Vec<Socket>,
+	sockets: Vec<(Socket, Endpoint)>,
 	method_buf: [u8;2],
 }
 
@@ -47,7 +47,8 @@ impl<S> Worker<S> where S: IpcInterface<S> {
 	}
 
 	pub fn poll(&mut self) {
-		for socket in self.sockets.iter_mut() {
+		for item in self.sockets.iter_mut() {
+			let socket = &mut item.0;
 			// non-blocking read only ok if there is something to read from socket
 			match socket.nb_read(&mut self.method_buf) {
 				Ok(method_sign_len) => {
@@ -79,12 +80,12 @@ impl<S> Worker<S> where S: IpcInterface<S> {
 			SocketError::DuplexLink
 		}));
 
-		try!(socket.bind(addr).map_err(|e| {
+		let endpoint = try!(socket.bind(addr).map_err(|e| {
 			warn!(target: "ipc", "Failed to bind socket to address '{}': {:?}", addr, e);
 			SocketError::DuplexLink
 		}));
 
-		self.sockets.push(socket);
+		self.sockets.push((socket, endpoint));
 		Ok(())
 	}
 }
@@ -132,7 +133,7 @@ mod tests {
 
 	fn dummy_write(addr: &str, buf: &[u8]) {
 		let mut socket = Socket::new(Protocol::Pair).unwrap();
-		socket.connect(addr).unwrap();
+		let endpoint = socket.connect(addr).unwrap();
 		thread::sleep_ms(10);
 		socket.write_all(buf).unwrap();
 	}
@@ -165,10 +166,8 @@ mod tests {
 
 		let mut worker = Worker::<DummyService>::new(Arc::new(DummyService::new()));
 		worker.add_duplex(url).unwrap();
-		thread::sleep_ms(10);
 
-		dummy_write(url, &vec![0, 0]);
-		thread::sleep_ms(10);
+		dummy_write(url, &vec![0, 0, 7, 7, 6, 6]);
 		worker.poll();
 
 		assert_eq!(1, worker.service.methods_stack.read().unwrap().len());