diff --git a/scripts/test-cluster b/scripts/test-cluster
index 486e3d636..8e400e0ee 100755
--- a/scripts/test-cluster
+++ b/scripts/test-cluster
@@ -1,18 +1,20 @@
 #!/bin/bash
 SESSION=etcd-cluster
 
+ulimit -n unlimited
+
 tmux new-session -d -s $SESSION
 
 # Setup a window for tailing log files
 tmux new-window -t $SESSION:1 -n 'peers'
 tmux split-window -h
 tmux select-pane -t 0
-tmux send-keys "./etcd -s 127.0.0.1:7001 -c 127.0.0.1:4001 -d peer1 -n peer1" C-m
+tmux send-keys "./bin/etcd -s 127.0.0.1:7001 -c 127.0.0.1:4001 -d peer1 -n peer1" C-m
 
 for i in 2 3; do
 	tmux select-pane -t 0
 	tmux split-window -v
-	tmux send-keys "./etcd -cors='*' -s 127.0.0.1:700${i} -c 127.0.0.1:400${i} -C 127.0.0.1:7001 -d peer${i} -n peer${i}" C-m
+	tmux send-keys "./bin/etcd -cors='*' -s 127.0.0.1:700${i} -c 127.0.0.1:400${i} -C 127.0.0.1:7001 -d peer${i} -n peer${i}" C-m
 done
 
 # Attach to session