diff --git a/pom.xml b/pom.xml
index ca129df..fc3f71f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,11 +7,11 @@
 		<version>1.2.1.RELEASE</version>
 		<relativePath/>
 	</parent>
-	<artifactId>spring-cloud-netflix-samples</artifactId>
+	<artifactId>spring-cloud-samples-tests</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Spring Cloud Netflix Samples</name>
-	<description>Spring Cloud Netflix Samples</description>
+	<name>Spring Cloud Samples Tests</name>
+	<description>Spring Cloud Samples Tests</description>
 	<url>http://projects.spring.io/spring-cloud/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
@@ -19,6 +19,7 @@
 	</organization>
 	<modules>
 		<module>zuul-proxy</module>
+		<module>zuul-proxy-eureka</module>
 	</modules>
 	<build>
 		<plugins>
diff --git a/zuul-proxy-eureka/pom.xml b/zuul-proxy-eureka/pom.xml
new file mode 100644
index 0000000..aa5a52d
--- /dev/null
+++ b/zuul-proxy-eureka/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.springframework.cloud</groupId>
+	<artifactId>spring-cloud-sample-zuul-proxy-eureka</artifactId>
+	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>spring-cloud-sample-zuul-proxy-eureka</name>
+	<description>Demo project for Spring Cloud</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.2.1.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<start-class>demo.DemoApplication</start-class>
+		<java.version>1.7</java.version>
+	</properties>
+	
+	<dependencyManagement>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-parent</artifactId>
+			<version>1.0.0.BUILD-SNAPSHOT</version>
+			<type>pom</type>
+			<scope>import</scope>
+		</dependency>
+	</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<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>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/zuul-proxy-eureka/src/main/java/demo/ZuulProxyEurekaApplication.java b/zuul-proxy-eureka/src/main/java/demo/ZuulProxyEurekaApplication.java
new file mode 100644
index 0000000..2e7ac9d
--- /dev/null
+++ b/zuul-proxy-eureka/src/main/java/demo/ZuulProxyEurekaApplication.java
@@ -0,0 +1,14 @@
+package demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
+
+@SpringBootApplication
+@EnableZuulProxy
+public class ZuulProxyEurekaApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ZuulProxyEurekaApplication.class, args);
+    }
+}
diff --git a/zuul-proxy-eureka/src/main/resources/application.properties b/zuul-proxy-eureka/src/main/resources/application.properties
new file mode 100644
index 0000000..e69de29
diff --git a/zuul-proxy-eureka/src/test/java/demo/ZuulProxyEurekaApplicationTests.java b/zuul-proxy-eureka/src/test/java/demo/ZuulProxyEurekaApplicationTests.java
new file mode 100644
index 0000000..0dc2004
--- /dev/null
+++ b/zuul-proxy-eureka/src/test/java/demo/ZuulProxyEurekaApplicationTests.java
@@ -0,0 +1,29 @@
+package demo;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = ZuulProxyEurekaApplication.class)
+public class ZuulProxyEurekaApplicationTests {
+
+	@Autowired
+	DiscoveryClient discoveryClient;
+
+	@Test
+	public void contextLoads() {
+	}
+
+	@Test
+	public void discoveryClientIsEureka() {
+		assertTrue("discoveryClient is wrong type", discoveryClient instanceof EurekaDiscoveryClient);
+	}
+
+}
diff --git a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
index d665c4c..30c942c 100644
--- a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
+++ b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
@@ -1,16 +1,28 @@
 package demo;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.NoopDiscoveryClient;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = ZuulProxyApplication.class)
 public class ZuulProxyApplicationTests {
 
+	@Autowired
+	DiscoveryClient discoveryClient;
+
 	@Test
 	public void contextLoads() {
 	}
 
+	@Test
+	public void discoveryClientIsNoop() {
+		assertTrue("discoveryClient is wrong type", discoveryClient instanceof NoopDiscoveryClient);
+	}
 }