diff --git a/client/cluster.go b/client/cluster.go
index 3fcc8ec04..b57f57c8d 100644
--- a/client/cluster.go
+++ b/client/cluster.go
@@ -33,6 +33,7 @@ func newHTTPClusterClient(tr *http.Transport, eps []string) (*httpClusterClient,
 		if err != nil {
 			return nil, err
 		}
+
 		c.endpoints[i] = &httpClient{
 			transport: tr,
 			endpoint:  *u,
diff --git a/client/keys.go b/client/keys.go
index 4e1c5d2cf..4235c05cc 100644
--- a/client/keys.go
+++ b/client/keys.go
@@ -41,16 +41,16 @@ var (
 	ErrKeyExists   = errors.New("client: key already exists")
 )
 
-func NewKeysAPI(tr *http.Transport, ep string, to time.Duration) (KeysAPI, error) {
-	return newHTTPKeysAPIWithPrefix(tr, ep, to, DefaultV2KeysPrefix)
+func NewKeysAPI(tr *http.Transport, eps []string, to time.Duration) (KeysAPI, error) {
+	return newHTTPKeysAPIWithPrefix(tr, eps, to, DefaultV2KeysPrefix)
 }
 
-func NewDiscoveryKeysAPI(tr *http.Transport, ep string, to time.Duration) (KeysAPI, error) {
-	return newHTTPKeysAPIWithPrefix(tr, ep, to, "")
+func NewDiscoveryKeysAPI(tr *http.Transport, eps []string, to time.Duration) (KeysAPI, error) {
+	return newHTTPKeysAPIWithPrefix(tr, eps, to, "")
 }
 
-func newHTTPKeysAPIWithPrefix(tr *http.Transport, ep string, to time.Duration, prefix string) (*httpKeysAPI, error) {
-	c, err := newHTTPClusterClient(tr, []string{ep})
+func newHTTPKeysAPIWithPrefix(tr *http.Transport, eps []string, to time.Duration, prefix string) (*httpKeysAPI, error) {
+	c, err := newHTTPClusterClient(tr, eps)
 	if err != nil {
 		return nil, err
 	}
diff --git a/client/members.go b/client/members.go
index eb798980c..5eeaea3f9 100644
--- a/client/members.go
+++ b/client/members.go
@@ -34,8 +34,8 @@ var (
 	DefaultV2MembersPrefix = "/v2/members"
 )
 
-func NewMembersAPI(tr *http.Transport, ep string, to time.Duration) (MembersAPI, error) {
-	c, err := newHTTPClusterClient(tr, []string{ep})
+func NewMembersAPI(tr *http.Transport, eps []string, to time.Duration) (MembersAPI, error) {
+	c, err := newHTTPClusterClient(tr, eps)
 	if err != nil {
 		return nil, err
 	}
diff --git a/discovery/discovery.go b/discovery/discovery.go
index a4d1089bd..b16f38713 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -106,7 +106,7 @@ func New(durl string, id types.ID, config string) (Discoverer, error) {
 	if err != nil {
 		return nil, err
 	}
-	c, err := client.NewDiscoveryKeysAPI(&http.Transport{Proxy: pf}, u.String(), client.DefaultRequestTimeout)
+	c, err := client.NewDiscoveryKeysAPI(&http.Transport{Proxy: pf}, []string{u.String()}, client.DefaultRequestTimeout)
 	if err != nil {
 		return nil, err
 	}
diff --git a/etcdctl/command/member_commands.go b/etcdctl/command/member_commands.go
index c713fe9f8..caf182e97 100644
--- a/etcdctl/command/member_commands.go
+++ b/etcdctl/command/member_commands.go
@@ -34,7 +34,7 @@ func NewMemberCommand() cli.Command {
 }
 
 func mustNewMembersAPI(c *cli.Context) client.MembersAPI {
-	mAPI, err := client.NewMembersAPI(&http.Transport{}, "http://127.0.0.1:4001", client.DefaultRequestTimeout)
+	mAPI, err := client.NewMembersAPI(&http.Transport{}, []string{"http://127.0.0.1:4001"}, client.DefaultRequestTimeout)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		os.Exit(1)