diff --git a/buildSrc/src/main/java/org/springframework/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/build/JavaConventions.java
index f0074f64791..99d9d97ef67 100644
--- a/buildSrc/src/main/java/org/springframework/build/JavaConventions.java
+++ b/buildSrc/src/main/java/org/springframework/build/JavaConventions.java
@@ -44,7 +44,7 @@ public class JavaConventions {
 	/**
 	 * The Java version we should use as the JVM baseline for building the project
 	 */
-	private static final JavaLanguageVersion DEFAULT_LANGUAGE_VERSION = JavaLanguageVersion.of(23);
+	private static final JavaLanguageVersion DEFAULT_LANGUAGE_VERSION = JavaLanguageVersion.of(24);
 
 	/**
 	 * The Java version we should use as the baseline for the compiled bytecode (the "-release" compiler argument)
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
index bbc972dbc07..19d1a66c7d7 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
@@ -95,9 +95,10 @@ class AspectJEnableCachingIsolatedTests {
 		}
 		catch (NoUniqueBeanDefinitionException ex) {
 			assertThat(ex.getMessage()).contains(
-					"no CacheResolver specified and expected single matching CacheManager but found 2: cm1,cm2");
+					"no CacheResolver specified and expected single matching CacheManager but found 2")
+					.contains("cm1", "cm2");
 			assertThat(ex.getNumberOfBeansFound()).isEqualTo(2);
-			assertThat(ex.getBeanNamesFound()).containsExactly("cm1", "cm2");
+			assertThat(ex.getBeanNamesFound()).containsExactlyInAnyOrder("cm1", "cm2");
 		}
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
index 923cf62ac9f..05d8b43c939 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
@@ -94,9 +94,10 @@ class EnableCachingTests extends AbstractCacheAnnotationTests {
 		assertThatThrownBy(ctx::refresh)
 				.isInstanceOfSatisfying(NoUniqueBeanDefinitionException.class, ex -> {
 					assertThat(ex.getMessage()).contains(
-							"no CacheResolver specified and expected single matching CacheManager but found 2: cm1,cm2");
+							"no CacheResolver specified and expected single matching CacheManager but found 2")
+							.contains("cm1", "cm2");
 					assertThat(ex.getNumberOfBeansFound()).isEqualTo(2);
-					assertThat(ex.getBeanNamesFound()).containsExactly("cm1", "cm2");
+					assertThat(ex.getBeanNamesFound()).containsExactlyInAnyOrder("cm1", "cm2");
 				}).hasNoCause();
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
index 71e2258e969..32d8c012e52 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
@@ -228,7 +228,7 @@ class ConfigurationClassProcessingTests {
 		BeanFactory factory = initBeanFactory(true, ConfigWithMethodNameMismatch.class);
 
 		SpousyTestBean foo = factory.getBean("foo", SpousyTestBean.class);
-		assertThat(foo.getName()).isEqualTo("foo1");
+		assertThat(foo.getName()).isIn("foo1", "foo2");
 	}
 
 	@Test