diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java
index 1e3d2173e7..4883c06814 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java
@@ -26,7 +26,12 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.testfixture.beans.factory.DummyFactory;
+import org.springframework.beans.testfixture.beans.factory.aot.GenericFactoryBean;
 import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationsCode;
+import org.springframework.beans.testfixture.beans.factory.aot.NumberFactoryBean;
+import org.springframework.beans.testfixture.beans.factory.aot.SimpleBean;
+import org.springframework.beans.testfixture.beans.factory.aot.SimpleBeanConfiguration;
+import org.springframework.beans.testfixture.beans.factory.aot.SimpleBeanFactoryBean;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.testfixture.aot.generate.TestGenerationContext;
 import org.springframework.util.ReflectionUtils;
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/DeferredTypeBuilder.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/DeferredTypeBuilder.java
index 18459ad256..3d4288278c 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/DeferredTypeBuilder.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/DeferredTypeBuilder.java
@@ -19,6 +19,7 @@ package org.springframework.beans.testfixture.beans.factory.aot;
 import java.util.function.Consumer;
 
 import org.springframework.javapoet.TypeSpec;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -30,6 +31,7 @@ import org.springframework.util.Assert;
  */
 public class DeferredTypeBuilder implements Consumer<TypeSpec.Builder> {
 
+	@Nullable
 	private Consumer<TypeSpec.Builder> type;
 
 	@Override
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/GenericFactoryBean.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/GenericFactoryBean.java
similarity index 95%
rename from spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/GenericFactoryBean.java
rename to spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/GenericFactoryBean.java
index 439e41f846..571b2d1509 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/GenericFactoryBean.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/GenericFactoryBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.aot;
+package org.springframework.beans.testfixture.beans.factory.aot;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.FactoryBean;
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanFactoryInitializationCode.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanFactoryInitializationCode.java
index 7d1eb4a237..01a78dda3b 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanFactoryInitializationCode.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanFactoryInitializationCode.java
@@ -42,16 +42,13 @@ public class MockBeanFactoryInitializationCode implements BeanFactoryInitializat
 
 
 	public MockBeanFactoryInitializationCode(GenerationContext generationContext) {
-		this.generatedClass = generationContext.getGeneratedClasses().addForFeature("TestCode", typeBuilder);
+		this.generatedClass = generationContext.getGeneratedClasses()
+				.addForFeature("TestCode", this.typeBuilder);
 	}
 
 
 	public DeferredTypeBuilder getTypeBuilder() {
-		return typeBuilder;
-	}
-
-	public GeneratedClass getGeneratedClass() {
-		return generatedClass;
+		return this.typeBuilder;
 	}
 
 	@Override
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationCode.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationCode.java
index 9e7197afc3..eeeceec3a1 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationCode.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationCode.java
@@ -48,11 +48,7 @@ public class MockBeanRegistrationCode implements BeanRegistrationCode {
 
 
 	public DeferredTypeBuilder getTypeBuilder() {
-		return typeBuilder;
-	}
-
-	public GeneratedClass getGeneratedClass() {
-		return this.generatedClass;
+		return this.typeBuilder;
 	}
 
 	@Override
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationsCode.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationsCode.java
index 8849d24361..6298824b70 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationsCode.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/MockBeanRegistrationsCode.java
@@ -41,11 +41,7 @@ public class MockBeanRegistrationsCode implements BeanRegistrationsCode {
 
 
 	public DeferredTypeBuilder getTypeBuilder() {
-		return typeBuilder;
-	}
-
-	public GeneratedClass getGeneratedClass() {
-		return this.generatedClass;
+		return this.typeBuilder;
 	}
 
 	@Override
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/NumberFactoryBean.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/NumberFactoryBean.java
similarity index 93%
rename from spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/NumberFactoryBean.java
rename to spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/NumberFactoryBean.java
index 5229f9ab86..bf333d05ce 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/NumberFactoryBean.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/NumberFactoryBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.aot;
+package org.springframework.beans.testfixture.beans.factory.aot;
 
 /**
  * A {@link GenericFactoryBean} that has a bound for the target type.
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/SimpleBean.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/SimpleBean.java
similarity index 91%
rename from spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/SimpleBean.java
rename to spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/SimpleBean.java
index c56d652004..f27c2a8454 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/SimpleBean.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/SimpleBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.aot;
+package org.springframework.beans.testfixture.beans.factory.aot;
 
 /**
  * An empty test bean used by code generation.
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/SimpleBeanConfiguration.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/SimpleBeanConfiguration.java
similarity index 92%
rename from spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/SimpleBeanConfiguration.java
rename to spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/SimpleBeanConfiguration.java
index f1ac30e157..2c4e5ede42 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/SimpleBeanConfiguration.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/SimpleBeanConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.aot;
+package org.springframework.beans.testfixture.beans.factory.aot;
 
 /**
  *
diff --git a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/SimpleBeanFactoryBean.java b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/SimpleBeanFactoryBean.java
similarity index 93%
rename from spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/SimpleBeanFactoryBean.java
rename to spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/SimpleBeanFactoryBean.java
index 9af17cd70c..6202888124 100644
--- a/spring-beans/src/testFixtures/java/org/springframework/beans/factory/aot/SimpleBeanFactoryBean.java
+++ b/spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/factory/aot/SimpleBeanFactoryBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.aot;
+package org.springframework.beans.testfixture.beans.factory.aot;
 
 import org.springframework.beans.factory.FactoryBean;