diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java
index 13ba197ccf..19e897cb82 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java
@@ -194,7 +194,7 @@ public abstract class UpgradeDependencies extends DefaultTask {
 		java.util.Optional<Milestone> matchingMilestone = milestones.stream()
 			.filter((milestone) -> milestone.getName().equals(getMilestone().get()))
 			.findFirst();
-		if (!matchingMilestone.isPresent()) {
+		if (matchingMilestone.isEmpty()) {
 			throw new InvalidUserDataException("Unknown milestone: " + getMilestone().get());
 		}
 		return matchingMilestone.get();
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOsCondition.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOsCondition.java
index 542bca5d5b..c3cad58fc3 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOsCondition.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOsCondition.java
@@ -37,7 +37,7 @@ class DisabledOnOsCondition implements ExecutionCondition {
 
 	@Override
 	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
-		if (!context.getElement().isPresent()) {
+		if (context.getElement().isEmpty()) {
 			return ConditionEvaluationResult.enabled("No element for @DisabledOnOs found");
 		}
 		MergedAnnotation<DisabledOnOs> annotation = MergedAnnotations