diff --git a/pom.xml b/pom.xml
index 2f40cd66a..c8bba9d2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,11 @@
 			<artifactId>spring-webflux</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
diff --git a/src/test/java/org/springframework/data/aot/BeanRegistrationContributionAssert.java b/src/test/java/org/springframework/data/aot/BeanRegistrationContributionAssert.java
index 7cab5f132..d500c072d 100644
--- a/src/test/java/org/springframework/data/aot/BeanRegistrationContributionAssert.java
+++ b/src/test/java/org/springframework/data/aot/BeanRegistrationContributionAssert.java
@@ -22,9 +22,9 @@ import java.util.function.Consumer;
 import org.assertj.core.api.AbstractAssert;
 
 import org.springframework.aot.generate.GenerationContext;
+import org.springframework.aot.test.generate.TestGenerationContext;
 import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
 import org.springframework.beans.factory.aot.BeanRegistrationCode;
-import org.springframework.test.aot.generate.TestGenerationContext;
 
 /**
  * @author Christoph Strobl
diff --git a/src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java b/src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java
index ea40b4de0..56d083110 100644
--- a/src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java
+++ b/src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java
@@ -24,9 +24,9 @@ import java.util.function.Consumer;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.aot.generate.GenerationContext;
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
+import org.springframework.aot.test.generate.TestGenerationContext;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -34,7 +34,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.data.domain.ManagedTypes;
-import org.springframework.test.aot.generate.TestGenerationContext;
 
 /**
  * @author Christoph Strobl
diff --git a/src/test/java/org/springframework/data/aot/RepositoryRegistrationAotContributionAssert.java b/src/test/java/org/springframework/data/aot/RepositoryRegistrationAotContributionAssert.java
index dd9f25207..24e5e0b6c 100644
--- a/src/test/java/org/springframework/data/aot/RepositoryRegistrationAotContributionAssert.java
+++ b/src/test/java/org/springframework/data/aot/RepositoryRegistrationAotContributionAssert.java
@@ -23,12 +23,11 @@ import java.util.Set;
 import java.util.function.Consumer;
 
 import org.assertj.core.api.AbstractAssert;
-
 import org.springframework.aot.generate.GenerationContext;
+import org.springframework.aot.test.generate.TestGenerationContext;
 import org.springframework.beans.factory.aot.BeanRegistrationCode;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.support.RepositoryFragment;
-import org.springframework.test.aot.generate.TestGenerationContext;
 
 /**
  * AssertJ {@link AbstractAssert Assertion} for {@link RepositoryRegistrationAotContribution}.