diff --git a/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
index 43acdf92..def49b0d 100644
--- a/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-zookeeper.adoc
@@ -22,6 +22,8 @@ Service Discovery is one of the key tenets of a microservice based architecture.
 
 Including a dependency on `org.springframework.cloud:spring-cloud-starter-zookeeper-discovery` will enable auto-configuration that will setup Spring Cloud Zookeeper Discovery.
 
+NOTE: You still need to include `org.springframework.boot:spring-boot-starter-web` for web functionality.
+
 === Registering with Zookeeper
 
 When a client registers with Zookeeper, it provides meta-data about itself such as host and port, id and name.
diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml
index 1d3d9258..55ab3e86 100644
--- a/spring-cloud-starter-zookeeper-discovery/pom.xml
+++ b/spring-cloud-starter-zookeeper-discovery/pom.xml
@@ -57,9 +57,5 @@
 			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon-loadbalancer</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml
index f3140da8..9747a323 100644
--- a/spring-cloud-starter-zookeeper/pom.xml
+++ b/spring-cloud-starter-zookeeper/pom.xml
@@ -20,10 +20,6 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-commons</artifactId>
diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml
index 8625935c..cdc61368 100644
--- a/spring-cloud-zookeeper-sample/pom.xml
+++ b/spring-cloud-zookeeper-sample/pom.xml
@@ -40,6 +40,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-zookeeper-all</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
diff --git a/spring-cloud-zookeeper-sample/src/main/resources/application.yml b/spring-cloud-zookeeper-sample/src/main/resources/application.yml
index d2e2e420..74dfbf44 100644
--- a/spring-cloud-zookeeper-sample/src/main/resources/application.yml
+++ b/spring-cloud-zookeeper-sample/src/main/resources/application.yml
@@ -12,5 +12,9 @@ endpoints:
 logging.level:
   org.apache.zookeeper.ClientCnxn: WARN
 
+management:
+  security:
+    enabled: false
+
 #spring.cloud.zookeeper.dependencies:
 #  - testZookeeperApp: ~
\ No newline at end of file
diff --git a/spring-cloud-zookeeper-sample/src/main/resources/bootstrap.yml b/spring-cloud-zookeeper-sample/src/main/resources/bootstrap.yml
index 6605f314..9a9223ee 100644
--- a/spring-cloud-zookeeper-sample/src/main/resources/bootstrap.yml
+++ b/spring-cloud-zookeeper-sample/src/main/resources/bootstrap.yml
@@ -1,7 +1,3 @@
 spring:
   application:
     name: testZookeeperApp
-  cloud:
-    config:
-      # TODO: refactor spring-cloud-config to use refresh, etc.. with out config client
-      enabled: false
diff --git a/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java b/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java
index e52ae668..d99f3b33 100644
--- a/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java
+++ b/spring-cloud-zookeeper-sample/src/test/java/org/springframework/cloud/zookeeper/sample/SampleApplicationTests.java
@@ -19,16 +19,28 @@ package org.springframework.cloud.zookeeper.sample;
 import org.apache.curator.test.TestingServer;
 import org.junit.Test;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.util.SocketUtils;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SampleApplicationTests {
 
 	@Test public void contextLoads() throws Exception {
-		int port = SocketUtils.findAvailableTcpPort();
-		TestingServer server = new TestingServer(port);
+		int zkPort = SocketUtils.findAvailableTcpPort();
+		TestingServer server = new TestingServer(zkPort);
 
-		ConfigurableApplicationContext context = new SpringApplicationBuilder(SampleZookeeperApplication.class).run("--server.port=0", "--spring.cloud.zookeeper.connectString=localhost:" + port);
+		int port = SocketUtils.findAvailableTcpPort(zkPort+1);
+
+		ConfigurableApplicationContext context = new SpringApplicationBuilder(SampleZookeeperApplication.class).run(
+				"--server.port="+port,
+				"--spring.cloud.zookeeper.connectString=localhost:" + zkPort);
+
+		ResponseEntity<String> response = new TestRestTemplate().getForEntity("http://localhost:"+port+"/health", String.class);
+		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
 		context.close();
 		server.close();