diff --git a/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/count/query/CountQueryTests.java
similarity index 99%
rename from src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java
rename to src/test/java/org/elasticsearch/count/query/CountQueryTests.java
index 4fdfb33ed5d..7739e8b2e0b 100644
--- a/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java
+++ b/src/test/java/org/elasticsearch/count/query/CountQueryTests.java
@@ -43,7 +43,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
-public class SimpleQueryTests extends ElasticsearchIntegrationTest {
+public class CountQueryTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void passQueryAsStringTest() throws Exception {
diff --git a/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
similarity index 99%
rename from src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java
rename to src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
index b6ac1f3fc84..e9a6e768226 100644
--- a/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java
+++ b/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
@@ -62,7 +62,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
 
-public class SimpleQueryTests extends ElasticsearchIntegrationTest {
+public class SearchQueryTests extends ElasticsearchIntegrationTest {
 
     @Override
     protected int maximumNumberOfShards() {