diff --git a/buildSrc/src/main/java/org/springframework/build/testsources/TestSourcesPlugin.java b/buildSrc/src/main/java/org/springframework/build/testsources/TestSourcesPlugin.java
index afe853b284..5bfbd3c3c2 100644
--- a/buildSrc/src/main/java/org/springframework/build/testsources/TestSourcesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/testsources/TestSourcesPlugin.java
@@ -60,11 +60,26 @@ public class TestSourcesPlugin implements Plugin<Project> {
 	 * <p>This is used to assist with the migration to Gradle test fixtures.
 	 */
 	private static final List<String> excludedProjects = Arrays.asList(
+			// "integration-tests",
 			"spring-beans",
 			"spring-context",
 			"spring-context-indexer",
 			"spring-context-support",
 			"spring-core"
+			// "spring-expression",
+			// "spring-instrument",
+			// "spring-jcl",
+			// "spring-jdbc",
+			// "spring-jms",
+			// "spring-messaging",
+			// "spring-orm",
+			// "spring-oxm",
+			// "spring-test",
+			// "spring-tx",
+			// "spring-web",
+			// "spring-webflux",
+			// "spring-webmvc",
+			// "spring-websocket"
 		);
 
 
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java
index 24fd8a30b9..eed37f21ec 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java
@@ -31,7 +31,7 @@ import org.springframework.cache.config.AnnotatedClassCacheableService;
 import org.springframework.cache.config.CacheableService;
 import org.springframework.cache.config.TestEntity;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.test.fixtures.cache.SomeCustomKeyGenerator;
+import org.springframework.context.testfixture.cache.SomeCustomKeyGenerator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
index 686acc5485..7ca1037efb 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingIsolatedTests.java
@@ -36,12 +36,12 @@ import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.test.fixtures.cache.CacheTestUtils;
-import org.springframework.context.test.fixtures.cache.SomeCustomKeyGenerator;
-import org.springframework.context.test.fixtures.cache.SomeKeyGenerator;
-import org.springframework.context.test.fixtures.cache.beans.AnnotatedClassCacheableService;
-import org.springframework.context.test.fixtures.cache.beans.CacheableService;
-import org.springframework.context.test.fixtures.cache.beans.DefaultCacheableService;
+import org.springframework.context.testfixture.cache.CacheTestUtils;
+import org.springframework.context.testfixture.cache.SomeCustomKeyGenerator;
+import org.springframework.context.testfixture.cache.SomeKeyGenerator;
+import org.springframework.context.testfixture.cache.beans.AnnotatedClassCacheableService;
+import org.springframework.context.testfixture.cache.beans.CacheableService;
+import org.springframework.context.testfixture.cache.beans.DefaultCacheableService;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingTests.java
index 8fc14ff045..7e693d6ea1 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJEnableCachingTests.java
@@ -30,9 +30,9 @@ import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.test.fixtures.cache.CacheTestUtils;
-import org.springframework.context.test.fixtures.cache.SomeCustomKeyGenerator;
-import org.springframework.context.test.fixtures.cache.SomeKeyGenerator;
+import org.springframework.context.testfixture.cache.CacheTestUtils;
+import org.springframework.context.testfixture.cache.SomeCustomKeyGenerator;
+import org.springframework.context.testfixture.cache.SomeKeyGenerator;
 
 /**
  * @author Stephane Nicoll
diff --git a/spring-aspects/src/test/resources/org/springframework/cache/config/annotation-cache-aspectj.xml b/spring-aspects/src/test/resources/org/springframework/cache/config/annotation-cache-aspectj.xml
index f9df2c29bf..1a283f6f6d 100644
--- a/spring-aspects/src/test/resources/org/springframework/cache/config/annotation-cache-aspectj.xml
+++ b/spring-aspects/src/test/resources/org/springframework/cache/config/annotation-cache-aspectj.xml
@@ -22,7 +22,7 @@
 
 	<cache:annotation-driven mode="aspectj" key-generator="keyGenerator"/>
 
-	<bean id="keyGenerator" class="org.springframework.context.test.fixtures.cache.SomeKeyGenerator"/>
+	<bean id="keyGenerator" class="org.springframework.context.testfixture.cache.SomeKeyGenerator"/>
 
 	<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
 		<property name="caches">
@@ -40,7 +40,7 @@
 		</property>
 	</bean>
 
-	<bean id="customKeyGenerator" class="org.springframework.context.test.fixtures.cache.SomeCustomKeyGenerator"/>
+	<bean id="customKeyGenerator" class="org.springframework.context.testfixture.cache.SomeCustomKeyGenerator"/>
 
 	<bean id="customCacheManager" class="org.springframework.cache.support.SimpleCacheManager">
 		<property name="caches">
diff --git a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
index 07af88796f..48e1fd5a93 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
@@ -21,7 +21,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.cache.Cache;
-import org.springframework.context.test.fixtures.cache.AbstractValueAdaptingCacheTests;
+import org.springframework.context.testfixture.cache.AbstractValueAdaptingCacheTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
index eff5470333..b9bb1cc854 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.cache.AbstractCacheTests;
+import org.springframework.context.testfixture.cache.AbstractCacheTests;
 import org.springframework.core.testfixture.EnabledForTestGroups;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
index bb7741478f..16bf562354 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
@@ -34,11 +34,11 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.test.fixtures.cache.AbstractCacheAnnotationTests;
-import org.springframework.context.test.fixtures.cache.SomeCustomKeyGenerator;
-import org.springframework.context.test.fixtures.cache.beans.AnnotatedClassCacheableService;
-import org.springframework.context.test.fixtures.cache.beans.CacheableService;
-import org.springframework.context.test.fixtures.cache.beans.DefaultCacheableService;
+import org.springframework.context.testfixture.cache.AbstractCacheAnnotationTests;
+import org.springframework.context.testfixture.cache.SomeCustomKeyGenerator;
+import org.springframework.context.testfixture.cache.beans.AnnotatedClassCacheableService;
+import org.springframework.context.testfixture.cache.beans.CacheableService;
+import org.springframework.context.testfixture.cache.beans.DefaultCacheableService;
 import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.support.TransactionTemplate;
 
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
index 4f9adba6ee..b826e2a3fb 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
@@ -25,7 +25,7 @@ import javax.cache.spi.CachingProvider;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
-import org.springframework.context.test.fixtures.cache.AbstractValueAdaptingCacheTests;
+import org.springframework.context.testfixture.cache.AbstractValueAdaptingCacheTests;
 
 /**
  * @author Stephane Nicoll
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java
index e8c4275823..9288994fc6 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java
@@ -42,7 +42,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.test.fixtures.cache.SomeKeyGenerator;
+import org.springframework.context.testfixture.cache.SomeKeyGenerator;
 import org.springframework.contextsupport.testfixture.jcache.AbstractJCacheAnnotationTests;
 import org.springframework.contextsupport.testfixture.jcache.JCacheableService;
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index dd8e884664..af7507470a 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -50,7 +50,7 @@ import org.springframework.beans.testfixture.beans.Person;
 import org.springframework.beans.testfixture.beans.SideEffectBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ApplicationListener;
-import org.springframework.context.test.fixtures.beans.TestApplicationListener;
+import org.springframework.context.testfixture.beans.TestApplicationListener;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.testfixture.TimeStamped;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
index 7b6cb703a7..7ef136b982 100644
--- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.test.fixtures.SimpleMapScope;
+import org.springframework.context.testfixture.SimpleMapScope;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 
diff --git a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java
index e933a9bf02..5ac1d4b225 100644
--- a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java
@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentMap;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.cache.AbstractValueAdaptingCacheTests;
+import org.springframework.context.testfixture.cache.AbstractValueAdaptingCacheTests;
 import org.springframework.core.serializer.support.SerializationDelegate;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java
index 1e99b6f796..7940c65b25 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/AnnotationDrivenCacheConfigTests.java
@@ -18,7 +18,7 @@ package org.springframework.cache.config;
 
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
-import org.springframework.context.test.fixtures.cache.AbstractCacheAnnotationTests;
+import org.springframework.context.testfixture.cache.AbstractCacheAnnotationTests;
 
 /**
  * @author Costin Leau
diff --git a/spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
index e032e36742..230337961b 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
@@ -22,7 +22,7 @@ import org.springframework.cache.interceptor.CacheErrorHandler;
 import org.springframework.cache.interceptor.CacheInterceptor;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
-import org.springframework.context.test.fixtures.cache.AbstractCacheAnnotationTests;
+import org.springframework.context.testfixture.cache.AbstractCacheAnnotationTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java b/spring-context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java
index 5b679a3269..f15aa696f1 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java
@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.cache.interceptor.CacheInterceptor;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
-import org.springframework.context.test.fixtures.cache.AbstractCacheAnnotationTests;
+import org.springframework.context.testfixture.cache.AbstractCacheAnnotationTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-context/src/test/java/org/springframework/cache/config/CustomInterceptorTests.java b/spring-context/src/test/java/org/springframework/cache/config/CustomInterceptorTests.java
index b94b3811de..1d83c6d00b 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/CustomInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/CustomInterceptorTests.java
@@ -32,9 +32,9 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.test.fixtures.cache.CacheTestUtils;
-import org.springframework.context.test.fixtures.cache.beans.CacheableService;
-import org.springframework.context.test.fixtures.cache.beans.DefaultCacheableService;
+import org.springframework.context.testfixture.cache.CacheTestUtils;
+import org.springframework.context.testfixture.cache.beans.CacheableService;
+import org.springframework.context.testfixture.cache.beans.DefaultCacheableService;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
index 2b1de9a12f..0d55805af6 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
@@ -33,13 +33,13 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.test.fixtures.cache.CacheTestUtils;
+import org.springframework.context.testfixture.cache.CacheTestUtils;
 import org.springframework.core.env.Environment;
 import org.springframework.mock.env.MockEnvironment;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.context.test.fixtures.cache.CacheTestUtils.assertCacheHit;
-import static org.springframework.context.test.fixtures.cache.CacheTestUtils.assertCacheMiss;
+import static org.springframework.context.testfixture.cache.CacheTestUtils.assertCacheHit;
+import static org.springframework.context.testfixture.cache.CacheTestUtils.assertCacheMiss;
 
 /**
  * Tests that represent real use cases with advanced configuration.
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
index 551b28c50f..fae93b5a59 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
@@ -34,13 +34,13 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.test.fixtures.cache.AbstractCacheAnnotationTests;
-import org.springframework.context.test.fixtures.cache.CacheTestUtils;
-import org.springframework.context.test.fixtures.cache.SomeCustomKeyGenerator;
-import org.springframework.context.test.fixtures.cache.SomeKeyGenerator;
-import org.springframework.context.test.fixtures.cache.beans.AnnotatedClassCacheableService;
-import org.springframework.context.test.fixtures.cache.beans.CacheableService;
-import org.springframework.context.test.fixtures.cache.beans.DefaultCacheableService;
+import org.springframework.context.testfixture.cache.AbstractCacheAnnotationTests;
+import org.springframework.context.testfixture.cache.CacheTestUtils;
+import org.springframework.context.testfixture.cache.SomeCustomKeyGenerator;
+import org.springframework.context.testfixture.cache.SomeKeyGenerator;
+import org.springframework.context.testfixture.cache.beans.AnnotatedClassCacheableService;
+import org.springframework.context.testfixture.cache.beans.CacheableService;
+import org.springframework.context.testfixture.cache.beans.DefaultCacheableService;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheResolverCustomizationTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheResolverCustomizationTests.java
index 45e3d57532..ca2e76fc36 100644
--- a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheResolverCustomizationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheResolverCustomizationTests.java
@@ -35,15 +35,15 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.test.fixtures.cache.CacheTestUtils;
+import org.springframework.context.testfixture.cache.CacheTestUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.springframework.context.test.fixtures.cache.CacheTestUtils.assertCacheHit;
-import static org.springframework.context.test.fixtures.cache.CacheTestUtils.assertCacheMiss;
+import static org.springframework.context.testfixture.cache.CacheTestUtils.assertCacheHit;
+import static org.springframework.context.testfixture.cache.CacheTestUtils.assertCacheMiss;
 
 /**
  * Provides various {@link CacheResolver} customisations scenario
diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheSyncFailureTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheSyncFailureTests.java
index cc5ffb0634..2a3eccc6db 100644
--- a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheSyncFailureTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheSyncFailureTests.java
@@ -32,7 +32,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.test.fixtures.cache.CacheTestUtils;
+import org.springframework.context.testfixture.cache.CacheTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
index a15cc4c768..09498371ab 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation4.DependencyBean;
 import org.springframework.context.annotation4.FactoryMethodComponent;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.test.fixtures.SimpleMapScope;
+import org.springframework.context.testfixture.SimpleMapScope;
 import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java
index 949fbd356d..7b63c97ad8 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.test.fixtures.index.CandidateComponentsTestClassLoader;
+import org.springframework.context.testfixture.index.CandidateComponentsTestClassLoader;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.ClassPathResource;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
index 7c1fa7016a..631ca5644f 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
@@ -41,7 +41,7 @@ import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.NestedTestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.test.fixtures.jndi.ExpectedLookupTemplate;
+import org.springframework.context.testfixture.jndi.ExpectedLookupTemplate;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 import org.springframework.jndi.support.SimpleJndiBeanFactory;
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
index 25061f5a04..9e203c4b63 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
@@ -51,7 +51,7 @@ import org.springframework.context.annotation.ComponentScanParserTests.KustomAnn
 import org.springframework.context.annotation.componentscan.simple.ClassWithNestedComponents;
 import org.springframework.context.annotation.componentscan.simple.SimpleComponent;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.test.fixtures.SimpleMapScope;
+import org.springframework.context.testfixture.SimpleMapScope;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Profiles;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java
index e0669373f7..cea9f6af5d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.context.test.fixtures.SimpleMapScope;
+import org.springframework.context.testfixture.SimpleMapScope;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
index 49cc3f85e9..2e92dbcaa1 100644
--- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
@@ -41,8 +41,8 @@ import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.context.support.StaticMessageSource;
-import org.springframework.context.test.fixtures.beans.BeanThatBroadcasts;
-import org.springframework.context.test.fixtures.beans.BeanThatListens;
+import org.springframework.context.testfixture.beans.BeanThatBroadcasts;
+import org.springframework.context.testfixture.beans.BeanThatListens;
 import org.springframework.core.Ordered;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.Order;
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index 72e593f7d4..ace9382ee7 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -28,7 +28,7 @@ import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.test.TestEvent;
 import org.springframework.context.support.StaticApplicationContext;
-import org.springframework.context.test.fixtures.beans.TestApplicationListener;
+import org.springframework.context.testfixture.beans.TestApplicationListener;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
diff --git a/spring-context/src/test/java/org/springframework/context/index/CandidateComponentsIndexLoaderTests.java b/spring-context/src/test/java/org/springframework/context/index/CandidateComponentsIndexLoaderTests.java
index 402dc3cdb7..2eac4a6688 100644
--- a/spring-context/src/test/java/org/springframework/context/index/CandidateComponentsIndexLoaderTests.java
+++ b/spring-context/src/test/java/org/springframework/context/index/CandidateComponentsIndexLoaderTests.java
@@ -21,7 +21,7 @@ import java.util.Set;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.index.CandidateComponentsTestClassLoader;
+import org.springframework.context.testfixture.index.CandidateComponentsTestClassLoader;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
index c3fbc6818a..403bf613be 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
@@ -28,9 +28,9 @@ import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.event.SimpleApplicationEventMulticaster;
-import org.springframework.context.test.fixtures.AbstractApplicationContextTests;
-import org.springframework.context.test.fixtures.beans.ACATester;
-import org.springframework.context.test.fixtures.beans.BeanThatListens;
+import org.springframework.context.testfixture.AbstractApplicationContextTests;
+import org.springframework.context.testfixture.beans.ACATester;
+import org.springframework.context.testfixture.beans.BeanThatListens;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
index ac15f3bcae..91c06a88da 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
@@ -26,9 +26,9 @@ import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.test.fixtures.AbstractApplicationContextTests;
-import org.springframework.context.test.fixtures.beans.ACATester;
-import org.springframework.context.test.fixtures.beans.BeanThatListens;
+import org.springframework.context.testfixture.AbstractApplicationContextTests;
+import org.springframework.context.testfixture.beans.ACATester;
+import org.springframework.context.testfixture.beans.BeanThatListens;
 import org.springframework.core.io.ClassPathResource;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
index 40771a9c6c..d9c0736075 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
@@ -29,9 +29,9 @@ import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.MessageSourceResolvable;
 import org.springframework.context.NoSuchMessageException;
-import org.springframework.context.test.fixtures.AbstractApplicationContextTests;
-import org.springframework.context.test.fixtures.beans.ACATester;
-import org.springframework.context.test.fixtures.beans.BeanThatListens;
+import org.springframework.context.testfixture.AbstractApplicationContextTests;
+import org.springframework.context.testfixture.beans.ACATester;
+import org.springframework.context.testfixture.beans.BeanThatListens;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
index f7660b8581..bf2e42a6c5 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.testfixture.beans.DerivedTestBean;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
-import org.springframework.context.test.fixtures.jndi.ExpectedLookupTemplate;
+import org.springframework.context.testfixture.jndi.ExpectedLookupTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
index e2e55593ba..9ece68cea2 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
@@ -21,7 +21,7 @@ import javax.naming.NamingException;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.jndi.SimpleNamingContext;
+import org.springframework.context.testfixture.jndi.SimpleNamingContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
index 430783e599..0057278c48 100644
--- a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
+++ b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml
@@ -36,13 +36,13 @@
 
 	<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
 
-	<bean id="service" class="org.springframework.context.test.fixtures.cache.beans.DefaultCacheableService"/>
+	<bean id="service" class="org.springframework.context.testfixture.cache.beans.DefaultCacheableService"/>
 
-	<bean id="classService" class="org.springframework.context.test.fixtures.cache.beans.AnnotatedClassCacheableService"/>
+	<bean id="classService" class="org.springframework.context.testfixture.cache.beans.AnnotatedClassCacheableService"/>
 
-	<bean id="keyGenerator" class="org.springframework.context.test.fixtures.cache.SomeKeyGenerator"/>
+	<bean id="keyGenerator" class="org.springframework.context.testfixture.cache.SomeKeyGenerator"/>
 
-	<bean id="customKeyGenerator" class="org.springframework.context.test.fixtures.cache.SomeCustomKeyGenerator"/>
+	<bean id="customKeyGenerator" class="org.springframework.context.testfixture.cache.SomeCustomKeyGenerator"/>
 
 	<bean id="customCacheManager" class="org.springframework.cache.support.SimpleCacheManager">
 		<property name="caches">
diff --git a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
index 0b914d6a98..9cffaef012 100644
--- a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
+++ b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml
@@ -26,15 +26,15 @@
 
 	<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
 
-	<bean id="service" class="org.springframework.context.test.fixtures.cache.beans.DefaultCacheableService"/>
+	<bean id="service" class="org.springframework.context.testfixture.cache.beans.DefaultCacheableService"/>
 
-	<bean id="classService" class="org.springframework.context.test.fixtures.cache.beans.AnnotatedClassCacheableService"/>
+	<bean id="classService" class="org.springframework.context.testfixture.cache.beans.AnnotatedClassCacheableService"/>
 
-	<bean id="keyGenerator" class="org.springframework.context.test.fixtures.cache.SomeKeyGenerator"/>
+	<bean id="keyGenerator" class="org.springframework.context.testfixture.cache.SomeKeyGenerator"/>
 
 	<bean id="errorHandler" class="org.springframework.cache.interceptor.SimpleCacheErrorHandler"/>
 
-	<bean id="customKeyGenerator" class="org.springframework.context.test.fixtures.cache.SomeCustomKeyGenerator"/>
+	<bean id="customKeyGenerator" class="org.springframework.context.testfixture.cache.SomeCustomKeyGenerator"/>
 
 	<bean id="customCacheManager" class="org.springframework.cache.support.SimpleCacheManager">
 		<property name="caches">
diff --git a/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml b/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml
index dc68f1adfc..ea6901d7a2 100644
--- a/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml
+++ b/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml
@@ -112,9 +112,9 @@
 		</property>
 	</bean>
 
-	<bean id="keyGenerator" class="org.springframework.context.test.fixtures.cache.SomeKeyGenerator"/>
+	<bean id="keyGenerator" class="org.springframework.context.testfixture.cache.SomeKeyGenerator"/>
 
-    <bean id="customKeyGenerator" class="org.springframework.context.test.fixtures.cache.SomeCustomKeyGenerator"/>
+    <bean id="customKeyGenerator" class="org.springframework.context.testfixture.cache.SomeCustomKeyGenerator"/>
 
 	<bean id="customCacheManager" class="org.springframework.cache.support.SimpleCacheManager">
 		<property name="caches">
@@ -126,7 +126,7 @@
 
 	<bean id="debugInterceptor" class="org.springframework.aop.interceptor.DebugInterceptor"/>
 
-	<bean id="service" class="org.springframework.context.test.fixtures.cache.beans.DefaultCacheableService"/>
+	<bean id="service" class="org.springframework.context.testfixture.cache.beans.DefaultCacheableService"/>
 
-	<bean id="classService" class="org.springframework.context.test.fixtures.cache.beans.AnnotatedClassCacheableService"/>
+	<bean id="classService" class="org.springframework.context.testfixture.cache.beans.AnnotatedClassCacheableService"/>
 </beans>
diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml b/spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
index 39e7db1965..40d1791c6d 100644
--- a/spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
+++ b/spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
@@ -17,7 +17,7 @@
 		<property name="scopes">
 			<map>
 				<entry key="${scopeName}">
-					<bean class="org.springframework.context.test.fixtures.SimpleMapScope"/>
+					<bean class="org.springframework.context.testfixture.SimpleMapScope"/>
 				</entry>
 			</map>
 		</property>
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/AbstractApplicationContextTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java
similarity index 96%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/AbstractApplicationContextTests.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java
index 929c804943..e3ba64f369 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/AbstractApplicationContextTests.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/AbstractApplicationContextTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures;
+package org.springframework.context.testfixture;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -33,9 +33,9 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.NoSuchMessageException;
-import org.springframework.context.test.fixtures.beans.ACATester;
-import org.springframework.context.test.fixtures.beans.BeanThatListens;
-import org.springframework.context.test.fixtures.beans.TestApplicationListener;
+import org.springframework.context.testfixture.beans.ACATester;
+import org.springframework.context.testfixture.beans.BeanThatListens;
+import org.springframework.context.testfixture.beans.TestApplicationListener;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/SimpleMapScope.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java
similarity index 97%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/SimpleMapScope.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java
index 089c75932f..9365c2b319 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/SimpleMapScope.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/SimpleMapScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures;
+package org.springframework.context.testfixture;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/ACATester.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/ACATester.java
similarity index 96%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/ACATester.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/ACATester.java
index 995b84b6a8..4d0fbd5d74 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/ACATester.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/ACATester.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.beans;
+package org.springframework.context.testfixture.beans;
 
 import java.util.Locale;
 
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/BeanThatBroadcasts.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/BeanThatBroadcasts.java
similarity index 95%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/BeanThatBroadcasts.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/BeanThatBroadcasts.java
index 3a50975f33..cc8e13832d 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/BeanThatBroadcasts.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/BeanThatBroadcasts.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.beans;
+package org.springframework.context.testfixture.beans;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/BeanThatListens.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/BeanThatListens.java
similarity index 96%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/BeanThatListens.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/BeanThatListens.java
index c7079188f9..f54e74c9ae 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/BeanThatListens.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/BeanThatListens.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.beans;
+package org.springframework.context.testfixture.beans;
 
 import java.util.Map;
 
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/TestApplicationListener.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/TestApplicationListener.java
similarity index 95%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/TestApplicationListener.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/TestApplicationListener.java
index a43e534dde..63749d326f 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/beans/TestApplicationListener.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/beans/TestApplicationListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.beans;
+package org.springframework.context.testfixture.beans;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/AbstractCacheAnnotationTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java
similarity index 98%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/AbstractCacheAnnotationTests.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java
index d94cacb17a..85f99eacce 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/AbstractCacheAnnotationTests.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache;
+package org.springframework.context.testfixture.cache;
 
 import java.util.Collection;
 import java.util.UUID;
@@ -28,9 +28,9 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.test.fixtures.cache.beans.AnnotatedClassCacheableService;
-import org.springframework.context.test.fixtures.cache.beans.CacheableService;
-import org.springframework.context.test.fixtures.cache.beans.TestEntity;
+import org.springframework.context.testfixture.cache.beans.AnnotatedClassCacheableService;
+import org.springframework.context.testfixture.cache.beans.CacheableService;
+import org.springframework.context.testfixture.cache.beans.TestEntity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/AbstractCacheTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java
similarity index 99%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/AbstractCacheTests.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java
index ab8490bd53..e01074417a 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/AbstractCacheTests.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache;
+package org.springframework.context.testfixture.cache;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/AbstractValueAdaptingCacheTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java
similarity index 96%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/AbstractValueAdaptingCacheTests.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java
index ccaa6ffe8e..5f0809deb1 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/AbstractValueAdaptingCacheTests.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache;
+package org.springframework.context.testfixture.cache;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/CacheTestUtils.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/CacheTestUtils.java
similarity index 97%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/CacheTestUtils.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/CacheTestUtils.java
index 1150a45a8f..459c3bf95f 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/CacheTestUtils.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/CacheTestUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache;
+package org.springframework.context.testfixture.cache;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/SomeCustomKeyGenerator.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/SomeCustomKeyGenerator.java
similarity index 96%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/SomeCustomKeyGenerator.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/SomeCustomKeyGenerator.java
index 296e3cd3a2..c9c476349e 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/SomeCustomKeyGenerator.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/SomeCustomKeyGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache;
+package org.springframework.context.testfixture.cache;
 
 import java.lang.reflect.Method;
 
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/SomeKeyGenerator.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/SomeKeyGenerator.java
similarity index 92%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/SomeKeyGenerator.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/SomeKeyGenerator.java
index b455526267..791d9f769c 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/SomeKeyGenerator.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/SomeKeyGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache;
+package org.springframework.context.testfixture.cache;
 
 import org.springframework.cache.interceptor.SimpleKeyGenerator;
 
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/AnnotatedClassCacheableService.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/AnnotatedClassCacheableService.java
similarity index 99%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/AnnotatedClassCacheableService.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/AnnotatedClassCacheableService.java
index 8441ed9baa..aaf8fb6881 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/AnnotatedClassCacheableService.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/AnnotatedClassCacheableService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache.beans;
+package org.springframework.context.testfixture.cache.beans;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/CacheableService.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/CacheableService.java
similarity index 96%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/CacheableService.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/CacheableService.java
index fbbb1fc572..06afcea22f 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/CacheableService.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/CacheableService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache.beans;
+package org.springframework.context.testfixture.cache.beans;
 
 /**
  * Basic service interface for caching tests.
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/DefaultCacheableService.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/DefaultCacheableService.java
similarity index 99%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/DefaultCacheableService.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/DefaultCacheableService.java
index 3c5a5d6665..017a719173 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/DefaultCacheableService.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/DefaultCacheableService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache.beans;
+package org.springframework.context.testfixture.cache.beans;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/TestEntity.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/TestEntity.java
similarity index 95%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/TestEntity.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/TestEntity.java
index db22131373..77c9e067b3 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/cache/beans/TestEntity.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/TestEntity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.cache.beans;
+package org.springframework.context.testfixture.cache.beans;
 
 import org.springframework.util.ObjectUtils;
 
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/index/CandidateComponentsTestClassLoader.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java
similarity index 98%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/index/CandidateComponentsTestClassLoader.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java
index 02c91ed3d2..7b6ad75257 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/index/CandidateComponentsTestClassLoader.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/index/CandidateComponentsTestClassLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.index;
+package org.springframework.context.testfixture.index;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/jndi/ExpectedLookupTemplate.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/ExpectedLookupTemplate.java
similarity index 93%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/jndi/ExpectedLookupTemplate.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/ExpectedLookupTemplate.java
index c5e575d22c..007f1e5e9c 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/jndi/ExpectedLookupTemplate.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/ExpectedLookupTemplate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.jndi;
+package org.springframework.context.testfixture.jndi;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -24,7 +24,7 @@ import javax.naming.NamingException;
 import org.springframework.jndi.JndiTemplate;
 
 /**
- * Copy of the standard {@link org.springframework.context.test.fixtures.jndi.jndi.ExpectedLookupTemplate}
+ * Copy of the standard {@link org.springframework.context.testfixture.jndi.jndi.ExpectedLookupTemplate}
  * for testing purposes.
  *
  * <p>Simple extension of the JndiTemplate class that always returns a given object.
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/jndi/SimpleNamingContext.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContext.java
similarity index 98%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/jndi/SimpleNamingContext.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContext.java
index f2f5450c84..7eeaea2f24 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/jndi/SimpleNamingContext.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.jndi;
+package org.springframework.context.testfixture.jndi;
 
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -156,7 +156,7 @@ public class SimpleNamingContext implements Context {
 	 * Note: Not intended for direct use by applications
 	 * if setting up a JVM-level JNDI environment.
 	 * Use SimpleNamingContextBuilder to set up JNDI bindings then.
-	 * @see org.springframework.context.test.fixtures.jndi.SimpleNamingContextBuilder#bind
+	 * @see org.springframework.context.testfixture.jndi.SimpleNamingContextBuilder#bind
 	 */
 	@Override
 	public void bind(String name, Object obj) {
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/jndi/SimpleNamingContextBuilder.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContextBuilder.java
similarity index 99%
rename from spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/jndi/SimpleNamingContextBuilder.java
rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContextBuilder.java
index 08deabe110..d686261d1a 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/test/fixtures/jndi/SimpleNamingContextBuilder.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContextBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.test.fixtures.jndi;
+package org.springframework.context.testfixture.jndi;
 
 import java.util.Hashtable;
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManagerTests.java
index 2dac01aab8..db1ed39662 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManagerTests.java
@@ -18,7 +18,7 @@ package org.springframework.orm.jpa.persistenceunit;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.index.CandidateComponentsTestClassLoader;
+import org.springframework.context.testfixture.index.CandidateComponentsTestClassLoader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.orm.jpa.domain.Person;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
index 3e3da8b68d..d7a78f9e87 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
@@ -28,7 +28,7 @@ import javax.sql.DataSource;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.jndi.SimpleNamingContextBuilder;
+import org.springframework.context.testfixture.jndi.SimpleNamingContextBuilder;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
index 9409e437ce..3114573ed0 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
@@ -37,8 +37,8 @@ import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.test.fixtures.SimpleMapScope;
-import org.springframework.context.test.fixtures.jndi.ExpectedLookupTemplate;
+import org.springframework.context.testfixture.SimpleMapScope;
+import org.springframework.context.testfixture.jndi.ExpectedLookupTemplate;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.orm.jpa.AbstractEntityManagerFactoryBeanTests;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
index fe6bc1d245..2319d34261 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
@@ -23,7 +23,7 @@ import javax.transaction.UserTransaction;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.jndi.ExpectedLookupTemplate;
+import org.springframework.context.testfixture.jndi.ExpectedLookupTemplate;
 import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.transaction.jta.UserTransactionAdapter;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
index bc0599b7f9..06b4675f3a 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
@@ -25,7 +25,7 @@ import com.ibm.wsspi.uow.UOWException;
 import com.ibm.wsspi.uow.UOWManager;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.jndi.ExpectedLookupTemplate;
+import org.springframework.context.testfixture.jndi.ExpectedLookupTemplate;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.transaction.IllegalTransactionStateException;
 import org.springframework.transaction.NestedTransactionNotSupportedException;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
index be9f8e6b43..579b7670b1 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
@@ -21,7 +21,7 @@ import javax.transaction.UserTransaction;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.jndi.SimpleNamingContextBuilder;
+import org.springframework.context.testfixture.jndi.SimpleNamingContextBuilder;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 import org.springframework.transaction.jta.JtaTransactionManager;
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/support/StandardServletEnvironmentTests.java b/spring-web/src/test/java/org/springframework/web/context/support/StandardServletEnvironmentTests.java
index 750cbf5581..3a792efed7 100644
--- a/spring-web/src/test/java/org/springframework/web/context/support/StandardServletEnvironmentTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/support/StandardServletEnvironmentTests.java
@@ -18,7 +18,7 @@ package org.springframework.web.context.support;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.context.test.fixtures.jndi.SimpleNamingContextBuilder;
+import org.springframework.context.testfixture.jndi.SimpleNamingContextBuilder;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
index 731997455c..a15153cadf 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
@@ -31,8 +31,8 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.NoSuchMessageException;
-import org.springframework.context.test.fixtures.AbstractApplicationContextTests;
-import org.springframework.context.test.fixtures.beans.TestApplicationListener;
+import org.springframework.context.testfixture.AbstractApplicationContextTests;
+import org.springframework.context.testfixture.beans.TestApplicationListener;
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.util.Assert;
 import org.springframework.web.context.support.XmlWebApplicationContext;
@@ -96,7 +96,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 
 	/**
 	 * Overridden as we can't trust superclass method
-	 * @see org.springframework.context.test.fixtures.AbstractApplicationContextTests#testEvents()
+	 * @see org.springframework.context.testfixture.AbstractApplicationContextTests#testEvents()
 	 */
 	@Override
 	protected void doTestEvents(TestApplicationListener listener, TestApplicationListener parentListener,
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/applicationContext.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/applicationContext.xml
index b0d94377dd..06b45bb167 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/applicationContext.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/applicationContext.xml
@@ -25,9 +25,9 @@
 	</bean>
 	-->
 
-	<bean id="beanThatListens" class="org.springframework.context.test.fixtures.beans.BeanThatListens"/>
+	<bean id="beanThatListens" class="org.springframework.context.testfixture.beans.BeanThatListens"/>
 
-	<bean id="parentListener" class="org.springframework.context.test.fixtures.beans.TestApplicationListener"/>
+	<bean id="parentListener" class="org.springframework.context.testfixture.beans.TestApplicationListener"/>
 
 	<!-- Inherited tests -->
 
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml
index 88b23df2cc..0cc0be7ffc 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml
@@ -3,11 +3,11 @@
 
 <beans>
 
-	<bean id="aca" class="org.springframework.context.test.fixtures.beans.ACATester"/>
+	<bean id="aca" class="org.springframework.context.testfixture.beans.ACATester"/>
 
-	<bean id="aca-prototype" class="org.springframework.context.test.fixtures.beans.ACATester" scope="prototype"/>
+	<bean id="aca-prototype" class="org.springframework.context.testfixture.beans.ACATester" scope="prototype"/>
 
-	<bean id="testListener" class="org.springframework.context.test.fixtures.beans.TestApplicationListener"/>
+	<bean id="testListener" class="org.springframework.context.testfixture.beans.TestApplicationListener"/>
 
 	<bean id="roderick" parent="rod">
 		<property name="name"><value>Roderick</value></property>
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml
index 78ae8e35af..2ad17cf513 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml
@@ -11,9 +11,9 @@
 		<property name="basenamePrefix"><value>org/springframework/web/context/WEB-INF/test-</value></property>
 	</bean>
 
-	<bean id="aca" class="org.springframework.context.test.fixtures.beans.ACATester"/>
+	<bean id="aca" class="org.springframework.context.testfixture.beans.ACATester"/>
 
-	<bean id="aca-prototype" class="org.springframework.context.test.fixtures.beans.ACATester" scope="prototype"/>
+	<bean id="aca-prototype" class="org.springframework.context.testfixture.beans.ACATester" scope="prototype"/>
 
 	<bean id="rod" class="org.springframework.beans.testfixture.beans.TestBean">
 		<property name="name"><value>Rod</value></property>
@@ -21,7 +21,7 @@
 		<property name="spouse"><ref bean="father"/></property>
 	</bean>
 
-	<bean id="testListener" class="org.springframework.context.test.fixtures.beans.TestApplicationListener"/>
+	<bean id="testListener" class="org.springframework.context.testfixture.beans.TestApplicationListener"/>
 
 	<bean id="roderick" parent="rod">
 		<property name="name"><value>Roderick</value></property>