diff --git a/etcd_client_test.go b/etcd_client_test.go
index 2426f37..ff9111c 100644
--- a/etcd_client_test.go
+++ b/etcd_client_test.go
@@ -79,12 +79,12 @@ func NewEtcdForTest(t *testing.T) *embed.Etcd {
 	var etcd *embed.Etcd
 	for port := 50000; port < 50100; port++ {
 		u.Host = net.JoinHostPort("localhost", strconv.Itoa(port))
-		cfg.LCUrls = []url.URL{*u}
-		cfg.ACUrls = []url.URL{*u}
+		cfg.ListenClientUrls = []url.URL{*u}
+		cfg.AdvertiseClientUrls = []url.URL{*u}
 		peerListener := u
 		peerListener.Host = net.JoinHostPort("localhost", strconv.Itoa(port+1))
-		cfg.LPUrls = []url.URL{*peerListener}
-		cfg.APUrls = []url.URL{*peerListener}
+		cfg.ListenPeerUrls = []url.URL{*peerListener}
+		cfg.AdvertisePeerUrls = []url.URL{*peerListener}
 		cfg.InitialCluster = "default=" + peerListener.String()
 		etcd, err = embed.StartEtcd(cfg)
 		if isErrorAddressAlreadyInUse(err) {
@@ -111,7 +111,7 @@ func NewEtcdClientForTest(t *testing.T) (*embed.Etcd, *EtcdClient) {
 	etcd := NewEtcdForTest(t)
 
 	config := goconf.NewConfigFile()
-	config.AddOption("etcd", "endpoints", etcd.Config().LCUrls[0].String())
+	config.AddOption("etcd", "endpoints", etcd.Config().ListenClientUrls[0].String())
 
 	client, err := NewEtcdClient(config, "")
 	if err != nil {
diff --git a/grpc_client_test.go b/grpc_client_test.go
index 0e8c6b0..8f79485 100644
--- a/grpc_client_test.go
+++ b/grpc_client_test.go
@@ -58,7 +58,7 @@ func NewGrpcClientsForTest(t *testing.T, addr string) *GrpcClients {
 
 func NewGrpcClientsWithEtcdForTest(t *testing.T, etcd *embed.Etcd) *GrpcClients {
 	config := goconf.NewConfigFile()
-	config.AddOption("etcd", "endpoints", etcd.Config().LCUrls[0].String())
+	config.AddOption("etcd", "endpoints", etcd.Config().ListenClientUrls[0].String())
 
 	config.AddOption("grpc", "targettype", "etcd")
 	config.AddOption("grpc", "targetprefix", "/grpctargets")
diff --git a/proxy/proxy_tokens_etcd_test.go b/proxy/proxy_tokens_etcd_test.go
index c7a78af..0fcb464 100644
--- a/proxy/proxy_tokens_etcd_test.go
+++ b/proxy/proxy_tokens_etcd_test.go
@@ -79,7 +79,7 @@ func newEtcdForTesting(t *testing.T) *embed.Etcd {
 	var etcd *embed.Etcd
 	for port := 50000; port < 50100; port++ {
 		u.Host = net.JoinHostPort("localhost", strconv.Itoa(port))
-		cfg.LCUrls = []url.URL{*u}
+		cfg.ListenClientUrls = []url.URL{*u}
 		etcd, err = embed.StartEtcd(cfg)
 		if isErrorAddressAlreadyInUse(err) {
 			continue
@@ -105,7 +105,7 @@ func newTokensEtcdForTesting(t *testing.T) (*tokensEtcd, *embed.Etcd) {
 	etcd := newEtcdForTesting(t)
 
 	cfg := goconf.NewConfigFile()
-	cfg.AddOption("etcd", "endpoints", etcd.Config().LCUrls[0].String())
+	cfg.AddOption("etcd", "endpoints", etcd.Config().ListenClientUrls[0].String())
 	cfg.AddOption("tokens", "keyformat", "/%s, /testing/%s/key")
 
 	tokens, err := NewProxyTokensEtcd(cfg)