diff --git a/gradle.properties b/gradle.properties
index 88867dc794a..df8e7455e80 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,8 +23,6 @@ snakeYamlVersion=2.5
 springFrameworkVersion=7.0.0-RC3
 springFramework60xVersion=6.0.23
 tomcatVersion=11.0.13
-nullabilityPluginVersion=0.0.5
+nullabilityPluginVersion=0.0.7
 
 kotlin.stdlib.default.dependency=false
-nullAwayVersion=0.12.10
-errorProneVersion=2.42.0
diff --git a/module/spring-boot-health/src/test/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/NoSuchHealthContributorFailureAnalyzerTests.java b/module/spring-boot-health/src/test/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/NoSuchHealthContributorFailureAnalyzerTests.java
index e1a9d1f6a13..a4483fe9c46 100644
--- a/module/spring-boot-health/src/test/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/NoSuchHealthContributorFailureAnalyzerTests.java
+++ b/module/spring-boot-health/src/test/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/NoSuchHealthContributorFailureAnalyzerTests.java
@@ -52,7 +52,9 @@ class NoSuchHealthContributorFailureAnalyzerTests {
 		AtomicReference<Throwable> failure = new AtomicReference<>();
 		this.runner.withPropertyValues("management.endpoint.health.group.readiness.include=dummy").run((context) -> {
 			assertThat(context).hasFailed();
-			failure.set(context.getStartupFailure());
+			Throwable startupFailure = context.getStartupFailure();
+			assertThat(startupFailure).isNotNull();
+			failure.set(startupFailure);
 		});
 		Throwable throwable = failure.get();
 		if (throwable instanceof NoSuchHealthContributorException) {
diff --git a/module/spring-boot-websocket/src/test/java/org/springframework/boot/websocket/autoconfigure/servlet/WebSocketMessagingAutoConfigurationTests.java b/module/spring-boot-websocket/src/test/java/org/springframework/boot/websocket/autoconfigure/servlet/WebSocketMessagingAutoConfigurationTests.java
index d2b964e9fa5..3bc30ea9d32 100644
--- a/module/spring-boot-websocket/src/test/java/org/springframework/boot/websocket/autoconfigure/servlet/WebSocketMessagingAutoConfigurationTests.java
+++ b/module/spring-boot-websocket/src/test/java/org/springframework/boot/websocket/autoconfigure/servlet/WebSocketMessagingAutoConfigurationTests.java
@@ -254,6 +254,7 @@ class WebSocketMessagingAutoConfigurationTests {
 
 					@Override
 					public void handleFrame(StompHeaders headers, @Nullable Object payload) {
+						assertThat(payload).isNotNull();
 						result.set(payload);
 						latch.countDown();
 					}