diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java
index d9670c1ce0..1e4c7aeffe 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java
@@ -61,10 +61,7 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud
 				metadataReaderFactory)) {
 			return true;
 		}
-		if (isUseDefaultFilters() && defaultInclude(metadataReader, metadataReaderFactory)) {
-			return true;
-		}
-		return false;
+		return isUseDefaultFilters() && defaultInclude(metadataReader, metadataReaderFactory);
 	}
 
 	protected boolean defaultInclude(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverContextCustomizerFactory.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverContextCustomizerFactory.java
index 2c2daad574..e0b0b1d52c 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverContextCustomizerFactory.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverContextCustomizerFactory.java
@@ -53,10 +53,7 @@ class WebDriverContextCustomizerFactory implements ContextCustomizerFactory {
 			if (obj == this) {
 				return true;
 			}
-			if (obj == null || obj.getClass() != getClass()) {
-				return false;
-			}
-			return true;
+			return obj != null && obj.getClass() == getClass();
 		}
 
 		@Override
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java
index 2a72555295..94270c1212 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java
@@ -56,7 +56,7 @@ public class BuildInfoProperties implements Serializable {
 		this.version = project.getObjects().property(String.class);
 		this.version.set(project.provider(() -> project.getVersion().toString()));
 		this.name = project.getObjects().property(String.class);
-		this.name.set(project.provider(() -> project.getName()));
+		this.name.set(project.provider(project::getName));
 	}
 
 	/**