diff --git a/pilot/pkg/serviceregistry/eureka/client.go b/pilot/pkg/serviceregistry/eureka/client.go
diff --git a/pilot/pkg/serviceregistry/eureka/client_test.go b/pilot/pkg/serviceregistry/eureka/client_test.go
diff --git a/pilot/pkg/serviceregistry/eureka/controller.go b/pilot/pkg/serviceregistry/eureka/controller.go
diff --git a/pilot/pkg/serviceregistry/eureka/controller_test.go b/pilot/pkg/serviceregistry/eureka/controller_test.go
diff --git a/pilot/pkg/serviceregistry/eureka/conversion.go b/pilot/pkg/serviceregistry/eureka/conversion.go
diff --git a/pilot/pkg/serviceregistry/eureka/conversion_test.go b/pilot/pkg/serviceregistry/eureka/conversion_test.go
diff --git a/pilot/pkg/serviceregistry/eureka/serviceaccounts.go b/pilot/pkg/serviceregistry/eureka/serviceaccounts.go
diff --git a/pilot/pkg/serviceregistry/eureka/servicediscovery.go b/pilot/pkg/serviceregistry/eureka/servicediscovery.go
diff --git a/pilot/pkg/serviceregistry/eureka/servicediscovery_test.go b/pilot/pkg/serviceregistry/eureka/servicediscovery_test.go
diff --git a/pilot/pkg/serviceregistry/eureka/testdata/eureka-apps.json b/pilot/pkg/serviceregistry/eureka/testdata/eureka-apps.json
diff --git a/pilot/pkg/serviceregistry/eureka/testdata/eureka-no-apps.json b/pilot/pkg/serviceregistry/eureka/testdata/eureka-no-apps.json
diff --git a/pilot/pkg/serviceregistry/platform.go b/pilot/pkg/serviceregistry/platform.go
@@ -26,8 +26,6 @@ const (
 	KubernetesRegistry ServiceRegistry = "Kubernetes"
 	// ConsulRegistry is a service registry backed by Consul
 	ConsulRegistry ServiceRegistry = "Consul"
-	// EurekaRegistry is a service registry backed by Eureka
-	EurekaRegistry ServiceRegistry = "Eureka"
 	// CloudFoundryRegistry is a service registry backed by Cloud Foundry.
 	CloudFoundryRegistry ServiceRegistry = "CloudFoundry"
 )
diff --git a/pilot/test/eurekamirror/eurekamirror.go b/pilot/test/eurekamirror/eurekamirror.go
diff --git a/samples/bookinfo/platform/eureka/README.md b/samples/bookinfo/platform/eureka/README.md
diff --git a/samples/bookinfo/platform/eureka/bookinfo.yaml b/samples/bookinfo/platform/eureka/bookinfo.yaml
diff --git a/samples/bookinfo/platform/eureka/cleanup.sh b/samples/bookinfo/platform/eureka/cleanup.sh
diff --git a/samples/bookinfo/platform/eureka/route-rule-all-v1.yaml b/samples/bookinfo/platform/eureka/route-rule-all-v1.yaml
diff --git a/samples/bookinfo/platform/eureka/route-rule-ratings-db.yaml b/samples/bookinfo/platform/eureka/route-rule-ratings-db.yaml
diff --git a/samples/bookinfo/platform/eureka/route-rule-ratings-test-abort.yaml b/samples/bookinfo/platform/eureka/route-rule-ratings-test-abort.yaml
diff --git a/samples/bookinfo/platform/eureka/route-rule-ratings-test-delay.yaml b/samples/bookinfo/platform/eureka/route-rule-ratings-test-delay.yaml
diff --git a/samples/bookinfo/platform/eureka/route-rule-reviews-50-v3.yaml b/samples/bookinfo/platform/eureka/route-rule-reviews-50-v3.yaml
diff --git a/samples/bookinfo/platform/eureka/route-rule-reviews-test-v2.yaml b/samples/bookinfo/platform/eureka/route-rule-reviews-test-v2.yaml
diff --git a/samples/bookinfo/platform/eureka/route-rule-reviews-v2-v3.yaml b/samples/bookinfo/platform/eureka/route-rule-reviews-v2-v3.yaml
diff --git a/samples/bookinfo/platform/eureka/route-rule-reviews-v3.yaml b/samples/bookinfo/platform/eureka/route-rule-reviews-v3.yaml
diff --git a/samples/bookinfo/platform/eureka/templates/bookinfo.sidecars.yaml.tmpl b/samples/bookinfo/platform/eureka/templates/bookinfo.sidecars.yaml.tmpl
diff --git a/tests/e2e/tests/pilot/pilot_test.go b/tests/e2e/tests/pilot/pilot_test.go
@@ -259,7 +259,7 @@ func getApps(tc *testConfig) []framework.App {
 
 func getApp(deploymentName, serviceName string, port1, port2, port3, port4, port5, port6 int,
 	version string, injectProxy bool, headless bool) framework.App {
-	// TODO(nmittler): Eureka does not support management ports ... should we support other registries?
+	// TODO(nmittler): Consul does not support management ports ... should we support other registries?
 	healthPort := "true"
 
 	// Return the config.

diff --git a/tests/e2e/tests/simple/nginx_test.go b/tests/e2e/tests/simple/nginx_test.go
@@ -126,7 +126,7 @@ func getApps(kubeMasterCIDR string) []framework.App {
 }
 
 func getApp(deploymentName, serviceName string, port1, port2, port3, port4, port5, port6 int, version string, injectProxy, perServiceAuth bool) framework.App {
-	// TODO(nmittler): Eureka does not support management ports ... should we support other registries?
+	// TODO(nmittler): Consul does not support management ports ... should we support other registries?
 	healthPort := "true"
 
 	// Return the config.

diff --git a/tools/istio-docker.mk b/tools/istio-docker.mk
@@ -54,7 +54,7 @@ $(ISTIO_DOCKER)/node_agent.crt $(ISTIO_DOCKER)/node_agent.key: ${GEN_CERT} $(IST
 # directives to copy files to docker scratch directory
 
 # tell make which files are copied form go/out
-DOCKER_FILES_FROM_ISTIO_OUT:=pilot-test-client pilot-test-server pilot-test-eurekamirror \
+DOCKER_FILES_FROM_ISTIO_OUT:=pilot-test-client pilot-test-server \
                              pilot-discovery pilot-agent sidecar-injector servicegraph mixs \
                              istio_ca node_agent galley
 $(foreach FILE,$(DOCKER_FILES_FROM_ISTIO_OUT), \
@@ -73,7 +73,6 @@ $(foreach FILE,$(DOCKER_FILES_FROM_SOURCE), \
 
 # pilot docker imagesDOCKER_BUILD_TOP
 
-docker.eurekamirror: $(ISTIO_DOCKER)/pilot-test-eurekamirror
 docker.proxy_init: $(ISTIO_DOCKER)/istio-iptables.sh
 docker.sidecar_injector: $(ISTIO_DOCKER)/sidecar-injector
 
@@ -165,8 +164,7 @@ docker.test_policybackend: $(ISTIO_OUT)/mixer-test-policybackend \
 	time (cd $(ISTIO_DOCKER)/test_policybackend && \
 		docker build -t $(HUB)/test_policybackend:$(TAG) -f Dockerfile.test_policybackend .)
 
-PILOT_DOCKER:=docker.eurekamirror \
-              docker.proxy_init docker.sidecar_injector
+PILOT_DOCKER:=docker.proxy_init docker.sidecar_injector
 $(PILOT_DOCKER): pilot/docker/Dockerfile$$(suffix $$@) | $(ISTIO_DOCKER)
 	$(DOCKER_RULE)