diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
index 87e9b25bb0f..49ef725782f 100644
--- a/etcdmain/etcd.go
+++ b/etcdmain/etcd.go
@@ -26,10 +26,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/etcd/discovery"
 	"github.com/coreos/etcd/embed"
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/api/etcdhttp"
+	"github.com/coreos/etcd/internal/discovery"
 	"github.com/coreos/etcd/pkg/cors"
 	"github.com/coreos/etcd/pkg/fileutil"
 	pkgioutil "github.com/coreos/etcd/pkg/ioutil"
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 981e688eef5..b1f49ebfe6f 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -30,7 +30,6 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/auth"
-	"github.com/coreos/etcd/discovery"
 	"github.com/coreos/etcd/etcdserver/api"
 	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
@@ -38,6 +37,7 @@ import (
 	"github.com/coreos/etcd/etcdserver/stats"
 	"github.com/coreos/etcd/internal/alarm"
 	"github.com/coreos/etcd/internal/compactor"
+	"github.com/coreos/etcd/internal/discovery"
 	"github.com/coreos/etcd/internal/raftsnap"
 	"github.com/coreos/etcd/lease"
 	"github.com/coreos/etcd/lease/leasehttp"
diff --git a/discovery/discovery.go b/internal/discovery/discovery.go
similarity index 100%
rename from discovery/discovery.go
rename to internal/discovery/discovery.go
diff --git a/discovery/discovery_test.go b/internal/discovery/discovery_test.go
similarity index 100%
rename from discovery/discovery_test.go
rename to internal/discovery/discovery_test.go