diff --git a/proxy/proxy.go b/proxy/proxy.go
index f781385b..80355605 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -73,7 +73,7 @@ func (proxy *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		proxy.serveWithInterceptor(&startContainerInterceptor{proxy.client, proxy.withDNS, proxy.withIPAM}, w, r)
 	case execCreateRegexp.MatchString(path):
 		proxy.serveWithInterceptor(&createExecInterceptor{proxy.client, proxy.withIPAM}, w, r)
-	case strings.HasPrefix(path, "/weave"):
+	case strings.HasPrefix(path, "/status"):
 		w.WriteHeader(http.StatusOK)
 	default:
 		proxy.serveWithInterceptor(&nullInterceptor{}, w, r)
diff --git a/weave b/weave
index 181ab48e..c0cbed9d 100755
--- a/weave
+++ b/weave
@@ -559,7 +559,7 @@ wait_for_status_ip() {
     WAIT_TIME=0
     while [ $WAIT_TIME -lt 3 ]; do
         sleep $WAIT_TIME
-        http_call_ip $1 $2 GET ${3:-/status} >/dev/null && return 0
+        http_call_ip $1 $2 GET /status >/dev/null && return 0
         WAIT_TIME=$((WAIT_TIME+1))
     done
     echo "Timed out waiting for container to start." >&2
@@ -866,7 +866,7 @@ case "$COMMAND" in
             $WEAVEPROXY_DOCKER_ARGS \
             $EXEC_IMAGE "$@")
 
-        wait_for_status_ip $PROXY_HOST $PROXY_PORT /weave
+        wait_for_status_ip $PROXY_HOST $PROXY_PORT
         echo $PROXY_CONTAINER
         ;;
     connect)