diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
similarity index 98%
rename from spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheTests.java
rename to spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
index da5ae2d0dd4..f08a357ff19 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheAnnotationTests.java
@@ -43,7 +43,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Stephane Nicoll
  */
-public class JCacheEhCacheTests extends AbstractAnnotationTests {
+public class JCacheEhCacheAnnotationTests extends AbstractAnnotationTests {
 
 	private CacheManager jCacheManager;
 
diff --git a/spring-test/src/test/java/org/springframework/cache/jcache/JCacheEhCache3Tests.java b/spring-test/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java
similarity index 90%
rename from spring-test/src/test/java/org/springframework/cache/jcache/JCacheEhCache3Tests.java
rename to spring-test/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java
index a000d369263..895df982a0e 100644
--- a/spring-test/src/test/java/org/springframework/cache/jcache/JCacheEhCache3Tests.java
+++ b/spring-test/src/test/java/org/springframework/cache/jcache/JCacheEhCache3AnnotationTests.java
@@ -20,13 +20,13 @@ import javax.cache.Caching;
 import javax.cache.spi.CachingProvider;
 
 /**
- * Just here to be run against EHCache 3, whereas the original JCacheEhCacheTests
+ * Just here to be run against EHCache 3, whereas the original JCacheEhCacheAnnotationTests
  * runs against EhCache 2.x with the EhCache-JCache add-on.
  *
  * @author Juergen Hoeller
  * @since 4.2.1
  */
-public class JCacheEhCache3Tests extends JCacheEhCacheTests {
+public class JCacheEhCache3AnnotationTests extends JCacheEhCacheAnnotationTests {
 
 	@Override
 	protected CachingProvider getCachingProvider() {