diff --git a/etcd_client_test.go b/etcd_client_test.go
index ff9111c..0a673e2 100644
--- a/etcd_client_test.go
+++ b/etcd_client_test.go
@@ -81,8 +81,11 @@ func NewEtcdForTest(t *testing.T) *embed.Etcd {
 		u.Host = net.JoinHostPort("localhost", strconv.Itoa(port))
 		cfg.ListenClientUrls = []url.URL{*u}
 		cfg.AdvertiseClientUrls = []url.URL{*u}
+		httpListener := u
+		httpListener.Host = net.JoinHostPort("localhost", strconv.Itoa(port+1))
+		cfg.ListenClientHttpUrls = []url.URL{*httpListener}
 		peerListener := u
-		peerListener.Host = net.JoinHostPort("localhost", strconv.Itoa(port+1))
+		peerListener.Host = net.JoinHostPort("localhost", strconv.Itoa(port+2))
 		cfg.ListenPeerUrls = []url.URL{*peerListener}
 		cfg.AdvertisePeerUrls = []url.URL{*peerListener}
 		cfg.InitialCluster = "default=" + peerListener.String()
diff --git a/proxy/proxy_tokens_etcd_test.go b/proxy/proxy_tokens_etcd_test.go
index 0fcb464..ea0ae4f 100644
--- a/proxy/proxy_tokens_etcd_test.go
+++ b/proxy/proxy_tokens_etcd_test.go
@@ -80,6 +80,9 @@ func newEtcdForTesting(t *testing.T) *embed.Etcd {
 	for port := 50000; port < 50100; port++ {
 		u.Host = net.JoinHostPort("localhost", strconv.Itoa(port))
 		cfg.ListenClientUrls = []url.URL{*u}
+		httpListener := u
+		httpListener.Host = net.JoinHostPort("localhost", strconv.Itoa(port+1))
+		cfg.ListenClientHttpUrls = []url.URL{*httpListener}
 		etcd, err = embed.StartEtcd(cfg)
 		if isErrorAddressAlreadyInUse(err) {
 			continue