diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/integration/RedisBinderModuleTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/integration/RedisBinderModuleTests.java
index 7c8d104e7..241fa93dc 100644
--- a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/integration/RedisBinderModuleTests.java
+++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/test/java/org/springframework/cloud/stream/binder/redis/integration/RedisBinderModuleTests.java
@@ -48,7 +48,7 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
 public class RedisBinderModuleTests {
 
 	@ClassRule
-	public static RedisTestSupport rabbitTestSupport = new RedisTestSupport();
+	public static RedisTestSupport redisTestSupport = new RedisTestSupport();
 
 	private ConfigurableApplicationContext context = null;
 
@@ -66,8 +66,8 @@ public class RedisBinderModuleTests {
 	@Test
 	public void testParentConnectionFactoryInheritedByDefault() {
 		context = SpringApplication.run(SimpleProcessor.class);
-		BinderFactory binderFactory = context.getBean(BinderFactory.class);
-		Binder binder = binderFactory.getBinder(null);
+		BinderFactory<?> binderFactory = context.getBean(BinderFactory.class);
+		Binder<?> binder = binderFactory.getBinder(null);
 		assertThat(binder, instanceOf(RedisMessageChannelBinder.class));
 		DirectFieldAccessor binderFieldAccessor = new DirectFieldAccessor(binder);
 		RedisConnectionFactory binderConnectionFactory =
@@ -80,8 +80,8 @@ public class RedisBinderModuleTests {
 	@Test
 	public void testParentConnectionFactoryInheritedIfOverridden() {
 		context = new SpringApplication(SimpleProcessor.class, ConnectionFactoryConfiguration.class).run();
-		BinderFactory binderFactory = context.getBean(BinderFactory.class);
-		Binder binder = binderFactory.getBinder(null);
+		BinderFactory<?> binderFactory = context.getBean(BinderFactory.class);
+		Binder<?> binder = binderFactory.getBinder(null);
 		assertThat(binder, instanceOf(RedisMessageChannelBinder.class));
 		DirectFieldAccessor binderFieldAccessor = new DirectFieldAccessor(binder);
 		RedisConnectionFactory binderConnectionFactory =
@@ -99,8 +99,8 @@ public class RedisBinderModuleTests {
 		params.add("--spring.cloud.stream.binders.custom.type=redis");
 		params.add("--spring.cloud.stream.binders.custom.environment.foo=bar");
 		context = SpringApplication.run(SimpleProcessor.class, params.toArray(new String[]{}));
-		BinderFactory binderFactory = context.getBean(BinderFactory.class);
-		Binder binder = binderFactory.getBinder(null);
+		BinderFactory<?> binderFactory = context.getBean(BinderFactory.class);
+		Binder<?> binder = binderFactory.getBinder(null);
 		assertThat(binder, instanceOf(RedisMessageChannelBinder.class));
 		DirectFieldAccessor binderFieldAccessor = new DirectFieldAccessor(binder);
 		RedisConnectionFactory binderConnectionFactory =
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/DefaultBinderFactory.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/DefaultBinderFactory.java
index 6bee9e200..594f6487b 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/DefaultBinderFactory.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/DefaultBinderFactory.java
@@ -29,6 +29,7 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
@@ -52,6 +53,7 @@ public class DefaultBinderFactory<T> implements BinderFactory<T>, DisposableBean
 
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
+		Assert.isInstanceOf(ConfigurableApplicationContext.class, applicationContext);
 		this.context = (ConfigurableApplicationContext) applicationContext;
 	}