diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfiguration.java
index 25568379..47324f70 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfiguration.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfiguration.java
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.util.UtilAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -37,6 +38,7 @@ import org.springframework.context.event.EventListener;
 @ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false)
 @Configuration
 @Import({ UtilAutoConfiguration.class })
+@EnableDiscoveryClient
 public class DiscoveryClientConfigServiceBootstrapConfiguration {
 
 	private static Log logger = LogFactory.getLog(DiscoveryClientConfigServiceBootstrapConfiguration.class);
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java
new file mode 100644
index 00000000..6d7054a9
--- /dev/null
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/DiscoveryClientConfigServiceBootstrapConfigurationTests.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.config.client;
+
+import java.util.Arrays;
+
+import org.junit.After;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.test.EnvironmentTestUtils;
+import org.springframework.cloud.client.DefaultServiceInstance;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.config.client.ConfigClientProperties;
+import org.springframework.cloud.util.UtilAutoConfiguration;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.BDDMockito.given;
+
+/**
+ * @author Dave Syer
+ */
+public class DiscoveryClientConfigServiceBootstrapConfigurationTests {
+
+	private AnnotationConfigApplicationContext context;
+
+	private DiscoveryClient client = Mockito.mock(DiscoveryClient.class);
+
+	private ServiceInstance info = new DefaultServiceInstance("app", "foo", 8877, false);
+
+	@After
+	public void close() {
+		if (this.context != null) {
+			this.context.close();
+		}
+	}
+
+	@Test
+	public void offByDefault() throws Exception {
+		this.context = new AnnotationConfigApplicationContext(
+				DiscoveryClientConfigServiceBootstrapConfiguration.class);
+		assertEquals(0, this.context.getBeanNamesForType(DiscoveryClient.class).length);
+		assertEquals(0, this.context.getBeanNamesForType(
+				DiscoveryClientConfigServiceBootstrapConfiguration.class).length);
+	}
+
+	@Test
+	public void onWhenRequested() throws Exception {
+		given(this.client.getInstances("CONFIGSERVER"))
+				.willReturn(Arrays.asList(this.info));
+		setup("spring.cloud.config.discovery.enabled=true");
+		assertEquals(1, this.context.getBeanNamesForType(
+				DiscoveryClientConfigServiceBootstrapConfiguration.class).length);
+		Mockito.verify(this.client).getInstances("CONFIGSERVER");
+		ConfigClientProperties locator = this.context
+				.getBean(ConfigClientProperties.class);
+		assertEquals("http://foo:8877/", locator.getRawUri());
+	}
+
+	@Test
+	public void secureWhenRequested() throws Exception {
+		this.info = new DefaultServiceInstance("app", "foo", 443, true);
+		given(this.client.getInstances("CONFIGSERVER"))
+				.willReturn(Arrays.asList(this.info));
+		setup("spring.cloud.config.discovery.enabled=true");
+		assertEquals(1, this.context.getBeanNamesForType(
+				DiscoveryClientConfigServiceBootstrapConfiguration.class).length);
+		Mockito.verify(this.client).getInstances("CONFIGSERVER");
+		ConfigClientProperties locator = this.context
+				.getBean(ConfigClientProperties.class);
+		assertEquals("https://foo:443/", locator.getRawUri());
+	}
+
+	@Test
+	public void setsPasssword() throws Exception {
+		this.info.getMetadata().put("password", "bar");
+		given(this.client.getInstances("CONFIGSERVER"))
+				.willReturn(Arrays.asList(this.info));
+		setup("spring.cloud.config.discovery.enabled=true");
+		ConfigClientProperties locator = this.context
+				.getBean(ConfigClientProperties.class);
+		assertEquals("http://foo:8877/", locator.getRawUri());
+		assertEquals("bar", locator.getPassword());
+		assertEquals("user", locator.getUsername());
+	}
+
+	@Test
+	public void setsPath() throws Exception {
+		this.info.getMetadata().put("configPath", "/bar");
+		given(this.client.getInstances("CONFIGSERVER"))
+				.willReturn(Arrays.asList(this.info));
+		setup("spring.cloud.config.discovery.enabled=true");
+		ConfigClientProperties locator = this.context
+				.getBean(ConfigClientProperties.class);
+		assertEquals("http://foo:8877/bar", locator.getRawUri());
+	}
+
+	private void setup(String... env) {
+		this.context = new AnnotationConfigApplicationContext();
+		EnvironmentTestUtils.addEnvironment(this.context, env);
+		EnvironmentTestUtils.addEnvironment(this.context, "eureka.client.enabled=false");
+		this.context.getDefaultListableBeanFactory().registerSingleton("discoveryClient",
+				this.client);
+		this.context.register(UtilAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class,
+				DiscoveryClientConfigServiceBootstrapConfiguration.class,
+				ConfigClientProperties.class);
+		this.context.refresh();
+	}
+
+}