diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml
index 3b54be1..46cd818 100644
--- a/eureka-first/pom.xml
+++ b/eureka-first/pom.xml
@@ -38,8 +38,8 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java b/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java
index 8b09eb0..5a27ee6 100644
--- a/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java
+++ b/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java
@@ -27,7 +27,7 @@ public class EurekaFirstApplicationTests {
 
 	@Test
 	public void discoveryClientIsEureka() {
-		assertTrue("discoveryClient is wrong type", discoveryClient instanceof EurekaDiscoveryClient);
+		assertTrue("discoveryClient is wrong type: " + discoveryClient, discoveryClient instanceof EurekaDiscoveryClient);
 	}
 
 }
diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml
index 181871c..32cf42c 100644
--- a/netflix-sidecar/pom.xml
+++ b/netflix-sidecar/pom.xml
@@ -37,6 +37,11 @@
 	</dependencyManagement>
 
 	<dependencies>
+		<dependency>
+		<!-- TODO: remove this -->
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-zuul</artifactId>
diff --git a/netflix-sidecar/src/test/java/demo/SidecarApplicationTests.java b/netflix-sidecar/src/test/java/demo/SidecarApplicationTests.java
index 823e4bf..7e4e19d 100644
--- a/netflix-sidecar/src/test/java/demo/SidecarApplicationTests.java
+++ b/netflix-sidecar/src/test/java/demo/SidecarApplicationTests.java
@@ -1,17 +1,16 @@
 package demo;
 
-import com.netflix.appinfo.EurekaInstanceConfig;
+import static org.junit.Assert.assertEquals;
+
 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.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import static org.junit.Assert.*;
+import com.netflix.appinfo.EurekaInstanceConfig;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = SidecarApplication.class)
diff --git a/zuul-proxy-eureka/pom.xml b/zuul-proxy-eureka/pom.xml
index a3da3da..0ef7635 100644
--- a/zuul-proxy-eureka/pom.xml
+++ b/zuul-proxy-eureka/pom.xml
@@ -37,6 +37,11 @@
 	</dependencyManagement>
 
 	<dependencies>
+		<dependency>
+		<!-- TODO: remove this -->
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-zuul</artifactId>