diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableBinding.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableBinding.java
index 9d17a1434..b81eb6758 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableBinding.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableBinding.java
@@ -39,7 +39,6 @@ import org.springframework.integration.config.EnableIntegration;
  * @author Marius Bogoevici
  * @author David Turanski
  */
-@SuppressWarnings("deprecation")
 @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
index 4cd6085f5..ca349f29a 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
@@ -267,7 +267,7 @@ public class StreamListenerAnnotationBeanPostProcessor implements BeanPostProces
 	/**
 	 * This operations ensures that required dependencies are not accidentally injected early given that this bean is BPP.
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private void injectAndPostProcessDependencies() {
 		Collection<StreamListenerParameterAdapter> streamListenerParameterAdapters = this.applicationContext.getBeansOfType(StreamListenerParameterAdapter.class).values();
 		Collection<StreamListenerResultAdapter> streamListenerResultAdapters = this.applicationContext.getBeansOfType(StreamListenerResultAdapter.class).values();
@@ -327,6 +327,7 @@ public class StreamListenerAnnotationBeanPostProcessor implements BeanPostProces
 		}
 	}
 
+	@SuppressWarnings("rawtypes")
 	private class DefaultStreamListenerSetupMethodOrchestrator implements StreamListenerSetupMethodOrchestrator {
 
 		private final ConfigurableApplicationContext applicationContext;
@@ -370,7 +371,7 @@ public class StreamListenerAnnotationBeanPostProcessor implements BeanPostProces
 			return true;
 		}
 
-		@SuppressWarnings({"rawtypes", "unchecked"})
+		@SuppressWarnings("unchecked")
 		private void invokeStreamListenerResultAdapter(Method method, Object bean, String outboundName, Object... arguments) {
 			try {
 				if (Void.TYPE.equals(method.getReturnType())) {