diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
index b4c47a3fcb8..04717bee730 100644
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -82,7 +82,7 @@ func (fakeKubeletClient) GetPodStatus(host, podNamespace, podID string) (api.Pod
 	default:
 		glog.Fatalf("Can't get info for: '%v', '%v - %v'", host, podNamespace, podID)
 	}
-	r, err := c.GetPodStatus("localhost", podNamespace, podID)
+	r, err := c.GetPodStatus("127.0.0.1", podNamespace, podID)
 	if err != nil {
 		return r, err
 	}
@@ -114,7 +114,7 @@ func (h *delegateHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
 func startComponents(manifestURL string) (apiServerURL string) {
 	// Setup
-	servers := []string{"http://localhost:4001"}
+	servers := []string{}
 	glog.Infof("Creating etcd client pointing to %v", servers)
 	machineList := []string{"localhost", "127.0.0.1"}
 
@@ -163,6 +163,11 @@ func startComponents(manifestURL string) (apiServerURL string) {
 		glog.Fatalf("Nonnumeric port? %v", err)
 	}
 
+	publicAddress := net.ParseIP(host)
+	if publicAddress == nil {
+		glog.Fatalf("no public address for %s", host)
+	}
+
 	// Create a master and install handlers into mux.
 	m := master.New(&master.Config{
 		Client:            cl,
@@ -174,7 +179,7 @@ func startComponents(manifestURL string) (apiServerURL string) {
 		AdmissionControl:  admit.NewAlwaysAdmit(),
 		ReadWritePort:     portNumber,
 		ReadOnlyPort:      portNumber,
-		PublicAddress:     net.ParseIP(host),
+		PublicAddress:     publicAddress,
 		CacheTimeout:      2 * time.Second,
 	})
 	handler.delegate = m.Handler
diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
index 269266ac1d7..cf0253ed76f 100644
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -40,12 +40,12 @@ kube::etcd::start() {
   # Start etcd
   ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
   kube::log::usage "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null"
-  etcd -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null &
+  etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null &
   ETCD_PID=$!
 
   echo "Waiting for etcd to come up."
-  kube::util::wait_for_url "http://${testhost}:${port}/v2/machines" "etcd: " 0.25 80
-  curl -X PUT "http://${testhost}:${port}/v2/keys/_test"
+  kube::util::wait_for_url "http://${host}:${port}/v2/machines" "etcd: " 0.25 80
+  curl -X PUT "http://${host}:${port}/v2/keys/_test"
 }
 
 kube::etcd::cleanup() {
diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh
index c642fc5f959..f6c87338949 100755
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -93,7 +93,7 @@ sudo "${GO_OUT}/kube-apiserver" \
   --address="${API_HOST}" \
   --port="${API_PORT}" \
   --runtime_config=api/v1beta3 \
-  --etcd_servers="http://localhost:4001" \
+  --etcd_servers="http://127.0.0.1:4001" \
   --portal_net="10.0.0.0/24" \
   --cors_allowed_origins="${API_CORS_ALLOWED_ORIGINS}" >"${APISERVER_LOG}" 2>&1 &
 APISERVER_PID=$!