diff --git a/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java b/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java
index d2a3d9957..196deea68 100644
--- a/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java
+++ b/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java
@@ -20,8 +20,6 @@ import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.actuate.amqp.RabbitHealthIndicator;
-import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
 import org.springframework.boot.autoconfigure.amqp.RabbitProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -53,11 +51,11 @@ import org.springframework.util.StringUtils;
  * @author Ilayaperumal Gopinathan
  * @author Artem Bilan
  * @author Gary Russell
+ * @author Arnaud Deprez
  */
 @Configuration
 @ConditionalOnMissingBean(Binder.class)
-@Import({ RabbitMessageChannelBinderConfiguration.class,
-		RabbitServiceAutoConfiguration.RabbitHealthIndicatorConfiguration.class })
+@Import({ RabbitMessageChannelBinderConfiguration.class })
 public abstract class RabbitServiceAutoConfiguration {
 
 	static void configureCachingConnectionFactory(
@@ -198,19 +196,4 @@ public abstract class RabbitServiceAutoConfiguration {
 
 	}
 
-	/**
-	 * Configuration for Rabbit health indicator.
-	 *
-	 */
-	@Configuration
-	@ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator")
-	public static class RabbitHealthIndicatorConfiguration {
-
-		@Bean
-		public HealthIndicator binderHealthIndicator(RabbitTemplate rabbitTemplate) {
-			return new RabbitHealthIndicator(rabbitTemplate);
-		}
-
-	}
-
 }