diff --git a/glide.lock b/glide.lock
index 24d44a848..b78270bd7 100644
--- a/glide.lock
+++ b/glide.lock
@@ -119,7 +119,7 @@ imports:
   subpackages:
   - term
 - name: github.com/tendermint/merkleeyes
-  version: 0fab643ccac1a3f93b90e0e2682a5d1b9d17f8c4
+  version: ea4dd9c7b773435de26bf59fddf90afd43a07d67
   subpackages:
   - app
   - client
diff --git a/rpc/lib/rpc_test.go b/rpc/lib/rpc_test.go
index 2ce19fa75..f42fd274c 100644
--- a/rpc/lib/rpc_test.go
+++ b/rpc/lib/rpc_test.go
@@ -20,10 +20,10 @@ import (
 
 // Client and Server should work over tcp or unix sockets
 const (
-	tcpAddr = "tcp://0.0.0.0:46657"
+	tcpAddr = "tcp://0.0.0.0:47768"
 
-	unixSocket = "/tmp/rpc.sock"
-	unixAddr   = "unix:///tmp/rpc.sock"
+	unixSocket = "/tmp/rpc_test.sock"
+	unixAddr   = "unix://" + unixSocket
 
 	websocketEndpoint = "/websocket/endpoint"
 )