diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleEclipseLinkIntegrationTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EclipseLinkQueryByExampleIntegrationTests.java
similarity index 98%
rename from spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleEclipseLinkIntegrationTests.java
rename to spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EclipseLinkQueryByExampleIntegrationTests.java
index b0abec19ee..69e900a1a0 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleEclipseLinkIntegrationTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EclipseLinkQueryByExampleIntegrationTests.java
@@ -43,7 +43,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration({ "classpath:eclipselink.xml", "classpath:config/namespace-application-context.xml" })
 @Transactional
-class QueryByExampleEclipseLinkIntegrationTests {
+class EclipseLinkQueryByExampleIntegrationTests {
 
 	@Autowired RoleRepository repository;
 	@Autowired EntityManager em;
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleHibernateIntegrationTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleIntegrationTests.java
similarity index 98%
rename from spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleHibernateIntegrationTests.java
rename to spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleIntegrationTests.java
index 5d7c257f28..592d30d574 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleHibernateIntegrationTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleIntegrationTests.java
@@ -43,7 +43,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration({ "classpath:hibernate.xml", "classpath:config/namespace-application-context.xml" })
 @Transactional
-class QueryByExampleHibernateIntegrationTests {
+class QueryByExampleIntegrationTests {
 
 	@Autowired RoleRepository repository;
 	@Autowired EntityManager em;
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/MetaAnnotatedQueryMethodEclipseLinkIntegrationTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EclipseLinkMetaAnnotatedQueryMethodIntegrationTests.java
similarity index 99%
rename from spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/MetaAnnotatedQueryMethodEclipseLinkIntegrationTests.java
rename to spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EclipseLinkMetaAnnotatedQueryMethodIntegrationTests.java
index 21673b6f97..70ac8cf11f 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/MetaAnnotatedQueryMethodEclipseLinkIntegrationTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EclipseLinkMetaAnnotatedQueryMethodIntegrationTests.java
@@ -69,7 +69,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
 @Transactional
-class MetaAnnotatedQueryMethodEclipseLinkIntegrationTests {
+class EclipseLinkMetaAnnotatedQueryMethodIntegrationTests {
 
 	@Autowired RoleRepositoryWithMeta repository;
 
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/MetaAnnotatedQueryMethodHibernateIntegrationTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/MetaAnnotatedQueryMethodIntegrationTests.java
similarity index 99%
rename from spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/MetaAnnotatedQueryMethodHibernateIntegrationTests.java
rename to spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/MetaAnnotatedQueryMethodIntegrationTests.java
index 331512b2f2..7703e978d2 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/MetaAnnotatedQueryMethodHibernateIntegrationTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/MetaAnnotatedQueryMethodIntegrationTests.java
@@ -67,7 +67,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
 @Transactional
-class MetaAnnotatedQueryMethodHibernateIntegrationTests {
+class MetaAnnotatedQueryMethodIntegrationTests {
 
 	@Autowired RoleRepositoryWithMeta repository;
 
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryWithNullLikeHibernateIntegrationTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryWithNullLikeIntegrationTests.java
similarity index 98%
rename from spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryWithNullLikeHibernateIntegrationTests.java
rename to spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryWithNullLikeIntegrationTests.java
index 37dbb792a9..9afd65db6b 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryWithNullLikeHibernateIntegrationTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryWithNullLikeIntegrationTests.java
@@ -55,9 +55,9 @@
  * @author Yuriy Tsarkov
  */
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = QueryWithNullLikeHibernateIntegrationTests.Config.class)
+@ContextConfiguration(classes = QueryWithNullLikeIntegrationTests.Config.class)
 @Transactional
-class QueryWithNullLikeHibernateIntegrationTests {
+class QueryWithNullLikeIntegrationTests {
 
 	@Autowired EmployeeWithNullLikeRepository repository;