diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/AotTestAttributesCodeGenerator.java b/spring-test/src/main/java/org/springframework/test/context/aot/AotTestAttributesCodeGenerator.java
index 1feace365f8..202345cae19 100644
--- a/spring-test/src/main/java/org/springframework/test/context/aot/AotTestAttributesCodeGenerator.java
+++ b/spring-test/src/main/java/org/springframework/test/context/aot/AotTestAttributesCodeGenerator.java
@@ -48,6 +48,8 @@ class AotTestAttributesCodeGenerator {
 
 	private static final String GENERATED_SUFFIX = "Generated";
 
+	// TODO Consider an alternative means for specifying the name of the generated class.
+	// Ideally we would generate a class named: org.springframework.test.context.aot.GeneratedAotTestAttributes
 	static final String GENERATED_ATTRIBUTES_CLASS_NAME = AotTestAttributes.class.getName() + "__" + GENERATED_SUFFIX;
 
 	static final String GENERATED_ATTRIBUTES_METHOD_NAME = "getAttributes";
diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/AotTestContextInitializersCodeGenerator.java b/spring-test/src/main/java/org/springframework/test/context/aot/AotTestContextInitializersCodeGenerator.java
index 798023c62ae..80944e69ec6 100644
--- a/spring-test/src/main/java/org/springframework/test/context/aot/AotTestContextInitializersCodeGenerator.java
+++ b/spring-test/src/main/java/org/springframework/test/context/aot/AotTestContextInitializersCodeGenerator.java
@@ -63,8 +63,7 @@ class AotTestContextInitializersCodeGenerator {
 
 	private static final String GENERATED_SUFFIX = "Generated";
 
-	// TODO Add support in ClassNameGenerator for supplying a predefined class name.
-	// There is a similar issue in Spring Boot where code relies on a generated name.
+	// TODO Consider an alternative means for specifying the name of the generated class.
 	// Ideally we would generate a class named: org.springframework.test.context.aot.GeneratedAotTestContextInitializers
 	static final String GENERATED_MAPPINGS_CLASS_NAME = AotTestContextInitializers.class.getName() + "__" + GENERATED_SUFFIX;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java
index 5e6a5ec73c0..b5c45ce7ffc 100644
--- a/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.test.context.aot;
 
-
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;