diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
index 726b140..66beb00 100644
--- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
+++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
@@ -18,7 +18,6 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.interceptor.WireTap;
 import org.springframework.integration.config.GlobalChannelInterceptor;
@@ -37,12 +36,9 @@ import org.springframework.messaging.SubscribableChannel;
  * @author Dave Syer
  */
 @Configuration
-@ConditionalOnProperty(value = "bus.enabled", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.cloud.bus.enabled", matchIfMissing = true)
 public class BusAutoConfiguration {
 
-	@Autowired
-	private ConfigurableEnvironment environment;
-
 	@Autowired
 	private ConfigurableApplicationContext context;
 
@@ -134,13 +130,13 @@ public class BusAutoConfiguration {
 	protected static class BusRefreshConfiguration {
 
 		@Bean
-		@ConditionalOnProperty(value = "bus.refresh.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(value = "spring.cloud.bus.refresh.enabled", matchIfMissing = true)
 		public RefreshListener refreshListener(RefreshEndpoint refreshEndpoint) {
 			return new RefreshListener(refreshEndpoint);
 		}
 
 		@Configuration
-		@ConditionalOnProperty(value = "endpoints.bus.refresh.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(value = "endpoints.spring.cloud.bus.refresh.enabled", matchIfMissing = true)
 		protected static class BusRefreshEndpointConfiguration {
 			@Bean
 			public RefreshBusEndpoint refreshBusEndpoint(ApplicationContext context,
@@ -156,14 +152,14 @@ public class BusAutoConfiguration {
 	@ConditionalOnBean(EnvironmentManager.class)
 	protected static class BusEnvironmentConfiguration {
 		@Bean
-		@ConditionalOnProperty(value = "bus.env.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(value = "spring.cloud.bus.env.enabled", matchIfMissing = true)
 		public EnvironmentChangeListener environmentChangeListener() {
 			return new EnvironmentChangeListener();
 		}
 
 		@Configuration
 		@ConditionalOnClass(Endpoint.class)
-		@ConditionalOnProperty(value = "endpoints.bus.env.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(value = "endpoints.spring.cloud.bus.env.enabled", matchIfMissing = true)
 		protected static class EnvironmentBusEndpointConfiguration {
 			@Bean
 			public EnvironmentBusEndpoint environmentBusEndpoint(
diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/amqp/AmqpBusAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/amqp/AmqpBusAutoConfiguration.java
index 3da6a7c..ab45a2a 100644
--- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/amqp/AmqpBusAutoConfiguration.java
+++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/amqp/AmqpBusAutoConfiguration.java
@@ -9,7 +9,7 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.dsl.IntegrationFlow;
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  */
 @Configuration
 @ConditionalOnClass(AmqpTemplate.class)
-@ConditionalOnExpression("${bus.enabled:true} && ${bus.amqp.enabled:true}")
+@ConditionalOnProperty(value = "spring.cloud.bus.amqp.enabled", matchIfMissing = true)
 public class AmqpBusAutoConfiguration {
 
 	public static final String SPRING_CLOUD_BUS = "spring.cloud.bus";