diff --git a/zuul-proxy/pom.xml b/zuul-proxy/pom.xml
index 0f0064a..21eb501 100644
--- a/zuul-proxy/pom.xml
+++ b/zuul-proxy/pom.xml
@@ -29,6 +29,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-zuul</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-eureka</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
index 327a6f2..e59d47c 100644
--- a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
+++ b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
@@ -11,7 +11,7 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
 import org.springframework.boot.test.WebIntegrationTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
@@ -53,6 +53,6 @@ public class ZuulProxyApplicationTests {
 
 	@Test
 	public void discoveryClientIsNoop() {
-		assertTrue("discoveryClient is wrong type", this.discoveryClient instanceof NoopDiscoveryClient);
+		assertTrue("discoveryClient is wrong type", this.discoveryClient instanceof EurekaDiscoveryClient);
 	}
 }
diff --git a/zuul/pom.xml b/zuul/pom.xml
index 6045c67..2948b4b 100644
--- a/zuul/pom.xml
+++ b/zuul/pom.xml
@@ -47,15 +47,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-core</artifactId>
-		</dependency>
-        <dependency>
-            <groupId>com.netflix.zuul</groupId>
-            <artifactId>zuul-core</artifactId>
-        </dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter</artifactId>
+			<artifactId>spring-cloud-starter-zuul</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>