diff --git a/pom.xml b/pom.xml
index 44d519592..799e6a873 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,6 +321,7 @@
 					<useFile>false</useFile>
 					<includes>
 						<include>**/*Tests.java</include>
+						<include>**/*Test.java</include>
 					</includes>
 					<systemPropertyVariables>
 						<es.set.netty.runtime.available.processors>false</es.set.netty.runtime.available.processors>
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTestsTransport.java b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTransportTests.java
similarity index 90%
rename from src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTestsTransport.java
rename to src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTransportTests.java
index 58d1a5d90..bc3d729e1 100644
--- a/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTestsTransport.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTransportTests.java
@@ -24,8 +24,8 @@ import org.springframework.test.context.ContextConfiguration;
 /**
  * @author Peter-Josef Meisch
  */
-@ContextConfiguration(classes = { CriteriaQueryTestsTransport.Config.class })
-public class CriteriaQueryTestsTransport extends CriteriaQueryTests {
+@ContextConfiguration(classes = { CriteriaQueryTransportTests.Config.class })
+public class CriteriaQueryTransportTests extends CriteriaQueryTests {
 	@Configuration
 	@Import({ ElasticsearchTemplateConfiguration.class })
 	@EnableElasticsearchRepositories(considerNestedRepositories = true)