diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
index fae2645057c..f2fa11a0386 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
@@ -82,12 +82,10 @@ public class MessageSourceAutoConfigurationTests {
 
 	@Test
 	public void testBadEncoding() {
+		// Bad encoding just means the messages are ignored
 		this.contextRunner.withPropertyValues("spring.messages.encoding:rubbish")
-				.run((context) -> {
-					// Bad encoding just means the messages are ignored
-					assertThat(context.getMessage("foo", null, "blah", Locale.UK))
-							.isEqualTo("blah");
-				});
+				.run((context) -> assertThat(context.getMessage(
+						"foo", null, "blah", Locale.UK)).isEqualTo("blah"));
 	}
 
 	@Test
@@ -167,12 +165,10 @@ public class MessageSourceAutoConfigurationTests {
 
 	@Test
 	public void existingMessageSourceInParentIsIgnored() {
-		this.contextRunner.run((parent) -> {
-			this.contextRunner.withParent(parent)
-					.withPropertyValues("spring.messages.basename:test/messages")
-					.run((context) -> assertThat(context.getMessage(
-							"foo", null, "Foo message", Locale.UK)).isEqualTo("bar"));
-		});
+		this.contextRunner.run((parent) -> this.contextRunner.withParent(parent)
+				.withPropertyValues("spring.messages.basename:test/messages")
+				.run((context) -> assertThat(context.getMessage(
+						"foo", null, "Foo message", Locale.UK)).isEqualTo("bar")));
 	}
 
 	@Configuration
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
index e47282c7ff2..be8820f7f86 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
@@ -274,7 +274,7 @@ public class KafkaAutoConfigurationTests {
 	public void testKafkaTemplateRecordMessageConverters() {
 		this.contextRunner.withUserConfiguration(MessageConverterConfiguration.class)
 				.run((context) -> {
-					KafkaTemplate kafkaTemplate = context.getBean(KafkaTemplate.class);
+					KafkaTemplate<?, ?> kafkaTemplate = context.getBean(KafkaTemplate.class);
 					assertThat(kafkaTemplate.getMessageConverter())
 							.isSameAs(context.getBean("myMessageConverter"));
 				});
@@ -284,7 +284,7 @@ public class KafkaAutoConfigurationTests {
 	public void testConcurrentKafkaListenerContainerFactoryWithCustomMessageConverters() {
 		this.contextRunner.withUserConfiguration(MessageConverterConfiguration.class)
 				.run((context) -> {
-					ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = context
+					ConcurrentKafkaListenerContainerFactory<?, ?> kafkaListenerContainerFactory = context
 							.getBean(ConcurrentKafkaListenerContainerFactory.class);
 					DirectFieldAccessor dfa = new DirectFieldAccessor(
 							kafkaListenerContainerFactory);