diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
index e5cc670775a..3deaaadb279 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,12 +38,12 @@ import static org.springframework.beans.factory.support.BeanDefinitionReaderUtil
  *
  * @author Chris Beams
  */
+@SuppressWarnings("deprecation")
 public class PropertyPlaceholderConfigurerTests {
 
 	private static final String P1 = "p1";
 	private static final String P1_LOCAL_PROPS_VAL = "p1LocalPropsVal";
 	private static final String P1_SYSTEM_PROPS_VAL = "p1SystemPropsVal";
-	private static final String P1_SYSTEM_ENV_VAL = "p1SystemEnvVal";
 
 	private DefaultListableBeanFactory bf;
 	private PropertyPlaceholderConfigurer ppc;
@@ -149,7 +149,6 @@ public class PropertyPlaceholderConfigurerTests {
 		String P2 = "p2";
 		String P2_LOCAL_PROPS_VAL = "p2LocalPropsVal";
 		String P2_SYSTEM_PROPS_VAL = "p2SystemPropsVal";
-		String P2_SYSTEM_ENV_VAL = "p2SystemEnvVal";
 
 		AbstractBeanDefinition p2BeanDef = rootBeanDefinition(TestBean.class)
 				.addPropertyValue("name", "${" + P1 + "}")
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java
index 60228767197..d1f4c8518f1 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.lang.reflect.Method;
@@ -70,6 +71,7 @@ public class MethodMessageHandlerTests {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void bestMatch() throws NoSuchMethodException {
 		TestMethodMessageHandler handler = new TestMethodMessageHandler();
 		TestController controller = new TestController();
@@ -88,6 +90,7 @@ public class MethodMessageHandlerTests {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void argumentResolution() {
 
 		ArgumentResolverConfigurer configurer = new ArgumentResolverConfigurer();
@@ -108,6 +111,7 @@ public class MethodMessageHandlerTests {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void handleException() {
 
 		TestMethodMessageHandler handler = initMethodMessageHandler(TestController.class);
@@ -150,7 +154,6 @@ public class MethodMessageHandlerTests {
 			return delay("handleMessage");
 		}
 
-		@SuppressWarnings("rawtypes")
 		public Mono<String> handleMessageWithArgument(String payload) {
 			return delay("handleMessageWithArgument,payload=" + payload);
 		}