diff --git a/pom.xml b/pom.xml
index 95fa4fe3d..db9da884c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.2.RELEASE</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -25,7 +25,7 @@
 		<java.version>1.8</java.version>
 		<reactor.version>Dysprosium-SR4</reactor.version>
 		<objenesis.version>2.1</objenesis.version>
-		<spring-cloud-function.version>3.0.3.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.0.4.BUILD-SNAPSHOT</spring-cloud-function.version>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
 		<maven-checkstyle-plugin.includeTestSourceDirectory>true</maven-checkstyle-plugin.includeTestSourceDirectory>
diff --git a/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java b/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
index c2abc3c12..41d3e1325 100644
--- a/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
+++ b/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
@@ -91,7 +91,7 @@ public abstract class AbstractTestBinder<C extends AbstractBinder<MessageChannel
 			Assert.isTrue(
 					!CollectionUtils
 							.isEmpty(((AbstractSubscribableChannel) messageChannel)
-									.getChannelInterceptors()),
+								.getInterceptors()),
 					"'messageChannel' appears to be misconfigured. "
 							+ "Consider creating channel via AbstractBinderTest.createBindableChannel(..)");
 		}
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/stub1/StubBinder1Configuration.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/stub1/StubBinder1Configuration.java
index 45946e5d7..bf1c16e24 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/stub1/StubBinder1Configuration.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/stub1/StubBinder1Configuration.java
@@ -18,8 +18,8 @@ package org.springframework.cloud.stream.binder.stub1;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.actuate.health.PingHealthIndicator;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.stream.binder.Binder;
@@ -55,7 +55,7 @@ public class StubBinder1Configuration {
 
 	@Bean
 	public HealthIndicator binderHealthIndicator() {
-		return new ApplicationHealthIndicator();
+		return new PingHealthIndicator();
 	}
 
 }
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
index f216bc46c..2ae1750ec 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
@@ -842,10 +842,9 @@ public class ImplicitFunctionBindingTests {
 	@EnableAutoConfiguration
 	public static class FunctionSampleSpringIntegrationConfiguration {
 
-		@SuppressWarnings("deprecation")
 		@Bean
 		public IntegrationFlow uppercaseFlow() {
-			return IntegrationFlows.from(MessageFunction.class, "uppercase")
+			return IntegrationFlows.from(MessageFunction.class, gateway -> gateway.beanName("uppercase"))
 					.<String, String>transform(String::toUpperCase).logAndReply(LoggingHandler.Level.WARN);
 		}