diff --git a/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
index 4b3880e56831..b4f22a324ddc 100644
--- a/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
+++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java
@@ -273,7 +273,7 @@ public <T> AbstractObjectAssert<?, T> getBean(Class<T> type) {
 	 * given type
 	 */
 	@CheckReturnValue
-	public <T> AbstractObjectAssert<?, T> getBean(Class<T> type, Scope scope) {
+	public <T> AbstractObjectAssert<?, @Nullable T> getBean(Class<T> type, Scope scope) {
 		Assert.notNull(scope, "'scope' must not be null");
 		if (this.startupFailure != null) {
 			throwAssertionError(
@@ -334,7 +334,7 @@ private boolean isPrimary(String name, Scope scope) {
 	 * @throws AssertionError if the application context did not start
 	 */
 	@CheckReturnValue
-	public AbstractObjectAssert<?, Object> getBean(String name) {
+	public AbstractObjectAssert<?, @Nullable Object> getBean(String name) {
 		if (this.startupFailure != null) {
 			throwAssertionError(
 					contextFailedToStartWhenExpecting(this.startupFailure, "to contain a bean of name:%n <%s>", name));
@@ -362,7 +362,7 @@ public AbstractObjectAssert<?, Object> getBean(String name) {
 	 */
 	@SuppressWarnings("unchecked")
 	@CheckReturnValue
-	public <T> AbstractObjectAssert<?, T> getBean(String name, Class<T> type) {
+	public <T> AbstractObjectAssert<?, @Nullable T> getBean(String name, Class<T> type) {
 		if (this.startupFailure != null) {
 			throwAssertionError(contextFailedToStartWhenExpecting(this.startupFailure,
 					"to contain a bean of name:%n <%s> (%s)", name, type));
diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
index 2a638d5e2aef..7e6c48383a83 100644
--- a/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
+++ b/core/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
@@ -125,6 +125,7 @@ public ConfigurationPropertyCaching getCaching() {
 		return getCache().getSystemEnvironmentProperty(name);
 	}
 
+	@SuppressWarnings("NullAway") // https://github.com/uber/NullAway/issues/1578
 	@Override
 	public Stream<ConfigurationPropertyName> stream() {
 		@Nullable ConfigurationPropertyName[] names = getConfigurationPropertyNames();