diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
index b86d12edbc..a9377f5700 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
@@ -388,8 +388,8 @@ public class GenericApplicationContext extends AbstractApplicationContext implem
 	 * Load or refresh the persistent representation of the configuration up to
 	 * a point where the underlying bean factory is ready to create bean
 	 * instances.
-	 * <p>This variant of {@link #refresh()} is used by Ahead of Time processing
-	 * that optimizes the application context, typically at build-time.
+	 * <p>This variant of {@link #refresh()} is used by Ahead of Time (AOT)
+	 * processing that optimizes the application context, typically at build time.
 	 * <p>In this mode, only {@link BeanDefinitionRegistryPostProcessor} and
 	 * {@link MergedBeanDefinitionPostProcessor} are invoked.
 	 * @throws BeansException if the bean factory could not be initialized
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
index 611eedde25..ffb067b1c2 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
@@ -321,7 +321,7 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	 * Get the suffix to append to {@link ApplicationContext} resource locations
 	 * when detecting default locations.
 	 * <p>Subclasses must provide an implementation of this method that returns
-	 * a single suffix. Alternatively subclasses may provide a  <em>no-op</em>
+	 * a single suffix. Alternatively subclasses may provide a <em>no-op</em>
 	 * implementation of this method and override {@link #getResourceSuffixes()}
 	 * in order to provide multiple custom suffixes.
 	 * @return the resource suffix; never {@code null} or empty
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java
index e6ea430105..48ad2792a6 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -167,7 +167,7 @@ class DelegatingSmartContextLoaderTests {
 	}
 
 	@Test
-	void loadContextFromLocations() throws Exception {
+	void loadContextFromLocations() {
 		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() ->
 				loader.loadContext(EMPTY_STRING_ARRAY));
 	}
@@ -180,7 +180,7 @@ class DelegatingSmartContextLoaderTests {
 
 	static class ConfigClassTestCase {
 
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		static class Config {
 
 			@Bean