diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
index e0ba5fed723..30b31b7fc9a 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
@@ -88,12 +88,6 @@ public abstract class AnnotationConfigUtils {
 	public static final String COMMON_ANNOTATION_PROCESSOR_BEAN_NAME =
 			"org.springframework.context.annotation.internalCommonAnnotationProcessor";
 
-	/**
-	 * The bean name of the internally managed JSR-250 annotation processor.
-	 */
-	private static final String JSR250_ANNOTATION_PROCESSOR_BEAN_NAME =
-			"org.springframework.context.annotation.internalJsr250AnnotationProcessor";
-
 	/**
 	 * The bean name of the internally managed JPA annotation processor.
 	 */
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
index 58e131b50f2..28b65622503 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
@@ -463,7 +463,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
 	 */
 	@Test
 	void setAutodetectModeToAllSupportedValues() {
-		streamConstants(MBeanExporter.class)
+		streamAutodetectConstants()
 				.map(MBeanExporterTests::getFieldValue)
 				.forEach(mode -> assertThatNoException().isThrownBy(() -> exporter.setAutodetectMode(mode)));
 	}
@@ -512,7 +512,7 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
 	 */
 	@Test
 	void setAutodetectModeNameToAllSupportedValues() {
-		streamConstants(MBeanExporter.class)
+		streamAutodetectConstants()
 				.map(Field::getName)
 				.forEach(name -> assertThatNoException().isThrownBy(() -> exporter.setAutodetectModeName(name)));
 	}
@@ -703,8 +703,10 @@ public class MBeanExporterTests extends AbstractMBeanServerTests {
 		}
 	}
 
-	private static Stream<Field> streamConstants(Class<?> clazz) {
-		return Arrays.stream(clazz.getFields()).filter(ReflectionUtils::isPublicStaticFinal);
+	private static Stream<Field> streamAutodetectConstants() {
+		return Arrays.stream(MBeanExporter.class.getFields())
+				.filter(ReflectionUtils::isPublicStaticFinal)
+				.filter(field -> field.getName().startsWith("AUTODETECT_"));
 	}
 
 	private static Integer getFieldValue(Field field) {