diff --git a/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompat.java b/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatTests.java
similarity index 96%
rename from src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompat.java
rename to src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatTests.java
index 79263a0ad33..3eb69750894 100644
--- a/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompat.java
+++ b/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatTests.java
@@ -30,7 +30,7 @@ import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest;
 import org.junit.Test;
 import static org.hamcrest.Matchers.*;
 
-public class ClusterStateBackwardsCompat extends ElasticsearchBackwardsCompatIntegrationTest {
+public class ClusterStateBackwardsCompatTests extends ElasticsearchBackwardsCompatIntegrationTest {
 
     @Test
     public void testClusterState() throws Exception {
diff --git a/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompat.java b/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatTests.java
similarity index 97%
rename from src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompat.java
rename to src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatTests.java
index 26ad27cb065..0f93011a249 100644
--- a/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompat.java
+++ b/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatTests.java
@@ -34,7 +34,7 @@ import java.lang.reflect.Method;
 
 
 @ElasticsearchIntegrationTest.ClusterScope(scope= ElasticsearchIntegrationTest.Scope.SUITE,  numClientNodes = 0)
-public class NodesStatsBasicBackwardsCompat extends ElasticsearchBackwardsCompatIntegrationTest {
+public class NodesStatsBasicBackwardsCompatTests extends ElasticsearchBackwardsCompatIntegrationTest {
 
     @Test
     public void testNodeStatsSetIndices() throws Exception {