diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/ConcurrentPercolatorTests.java b/src/test/java/org/elasticsearch/test/integration/percolator/ConcurrentPercolatorTests.java
index 1ea858fdb43..fce7611e1b9 100644
--- a/src/test/java/org/elasticsearch/test/integration/percolator/ConcurrentPercolatorTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/percolator/ConcurrentPercolatorTests.java
@@ -50,7 +50,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde
 import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.elasticsearch.test.integration.percolator.SimplePercolatorTests.convertFromTextArray;
+import static org.elasticsearch.test.integration.percolator.PercolatorTests.convertFromTextArray;
 import static org.hamcrest.Matchers.*;
 
 
diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/MultiPercolatorTests.java b/src/test/java/org/elasticsearch/test/integration/percolator/MultiPercolatorTests.java
index f522207b63d..9f89b491218 100644
--- a/src/test/java/org/elasticsearch/test/integration/percolator/MultiPercolatorTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/percolator/MultiPercolatorTests.java
@@ -30,7 +30,7 @@ import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuild
 import static org.elasticsearch.common.xcontent.XContentFactory.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.elasticsearch.test.integration.percolator.SimplePercolatorTests.convertFromTextArray;
+import static org.elasticsearch.test.integration.percolator.PercolatorTests.convertFromTextArray;
 import static org.hamcrest.Matchers.*;
 
 /**
diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java b/src/test/java/org/elasticsearch/test/integration/percolator/PercolatorTests.java
similarity index 99%
rename from src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java
rename to src/test/java/org/elasticsearch/test/integration/percolator/PercolatorTests.java
index 01d286d10da..a5f524c5239 100644
--- a/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/percolator/PercolatorTests.java
@@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.*;
 /**
  *
  */
-public class SimplePercolatorTests extends AbstractSharedClusterTest {
+public class PercolatorTests extends AbstractSharedClusterTest {
 
     @Override
     protected int numberOfNodes() {
diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java b/src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java
index 0b9fabf56cc..b26c5e7bbb2 100644
--- a/src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java
@@ -49,7 +49,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.elasticsearch.test.integration.percolator.SimplePercolatorTests.convertFromTextArray;
+import static org.elasticsearch.test.integration.percolator.PercolatorTests.convertFromTextArray;
 import static org.elasticsearch.test.integration.percolator.TTLPercolatorTests.ensureGreen;
 import static org.hamcrest.Matchers.*;
 
diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/TTLPercolatorTests.java b/src/test/java/org/elasticsearch/test/integration/percolator/TTLPercolatorTests.java
index 388a9e46084..cebc7f08573 100644
--- a/src/test/java/org/elasticsearch/test/integration/percolator/TTLPercolatorTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/percolator/TTLPercolatorTests.java
@@ -17,7 +17,7 @@ import org.junit.Test;
 import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.elasticsearch.test.integration.percolator.SimplePercolatorTests.convertFromTextArray;
+import static org.elasticsearch.test.integration.percolator.PercolatorTests.convertFromTextArray;
 import static org.hamcrest.Matchers.*;
 
 /**