diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java
index acf425e4b59..0b1d3907012 100644
--- a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java
+++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizer.java
@@ -38,7 +38,7 @@ import org.springframework.test.context.MergedContextConfiguration;
  */
 class BeanOverrideContextCustomizer implements ContextCustomizer {
 
-	private static final String REGISTRAR_BEAN_NAME =
+	static final String REGISTRAR_BEAN_NAME =
 			"org.springframework.test.context.bean.override.internalBeanOverrideRegistrar";
 
 	private static final String INFRASTRUCTURE_BEAN_NAME =
diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java
index 10a59a5d301..a9bc8fbdef8 100644
--- a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java
@@ -93,8 +93,8 @@ public class BeanOverrideTestExecutionListener extends AbstractTestExecutionList
 
 		List<OverrideMetadata> metadataForFields = OverrideMetadata.forTestClass(testClass);
 		if (!metadataForFields.isEmpty()) {
-			BeanOverrideRegistrar registrar =
-					testContext.getApplicationContext().getBean(BeanOverrideRegistrar.class);
+			BeanOverrideRegistrar registrar = testContext.getApplicationContext()
+					.getBean(BeanOverrideContextCustomizer.REGISTRAR_BEAN_NAME, BeanOverrideRegistrar.class);
 			for (OverrideMetadata metadata : metadataForFields) {
 				consumer.accept(new TestContextOverrideMetadata(testInstance, metadata), registrar);
 			}