Tests: Rename integ tests to IT suffix

This rename effectively moves all integration tests to be run with `mvn
verify`. `mvn test` now runs in about 2 mins. This is a follow up to

298 files changed, 330 insertions, 330 deletions

diff --git a/core/src/test/java/org/elasticsearch/action/IndicesRequestTests.java b/core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java
index 97f0975b40..6bf1d3ab11 100644
--- a/core/src/test/java/org/elasticsearch/action/IndicesRequestTests.java
+++ b/core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java
@@ -124,7 +124,7 @@ import static org.hamcrest.Matchers.instanceOf;
 
 @ClusterScope(scope = Scope.SUITE, numClientNodes = 1, minNumDataNodes = 2)
 @Slow
-public class IndicesRequestTests extends ElasticsearchIntegrationTest {
+public class IndicesRequestIT extends ElasticsearchIntegrationTest {
 
     private final List<String> indices = new ArrayList<>();
 
diff --git a/core/src/test/java/org/elasticsearch/action/ListenerActionTests.java b/core/src/test/java/org/elasticsearch/action/ListenerActionIT.java
index 50cde99fcd..d371fd5b61 100644
--- a/core/src/test/java/org/elasticsearch/action/ListenerActionTests.java
+++ b/core/src/test/java/org/elasticsearch/action/ListenerActionIT.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 /**
  */
-public class ListenerActionTests extends ElasticsearchIntegrationTest {
+public class ListenerActionIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void verifyThreadedListeners() throws Throwable {
diff --git a/core/src/test/java/org/elasticsearch/action/RejectionActionTests.java b/core/src/test/java/org/elasticsearch/action/RejectionActionIT.java
index 273caa5229..7ca17b1a39 100644
--- a/core/src/test/java/org/elasticsearch/action/RejectionActionTests.java
+++ b/core/src/test/java/org/elasticsearch/action/RejectionActionIT.java
@@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  */
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 2)
-public class RejectionActionTests extends ElasticsearchIntegrationTest {
+public class RejectionActionIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java b/core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java
index 4b3ad48749..dd7b6fb2b9 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java
@@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.lessThan;
 /**
  */
 @Slow
-public class HotThreadsTest extends ElasticsearchIntegrationTest {
+public class HotThreadsIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testHotThreadsDontFail() throws ExecutionException, InterruptedException {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java
index 0fa72040da..90189204f7 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.hasSize;
  * The @ClusterScope TEST is needed because this class updates the cluster setting "cluster.blocks.read_only".
  */
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class RepositoryBlocksTests extends ElasticsearchIntegrationTest {
+public class RepositoryBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testPutRepositoryWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java
index 2f755cdf33..b3566013f6 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java
@@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.hasSize;
  * The @ClusterScope TEST is needed because this class updates the cluster setting "cluster.blocks.read_only".
  */
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class SnapshotBlocksTests extends ElasticsearchIntegrationTest {
+public class SnapshotBlocksIT extends ElasticsearchIntegrationTest {
 
     protected static final String INDEX_NAME = "test-blocks-1";
     protected static final String OTHER_INDEX_NAME = "test-blocks-2";
diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java
index 13c0ffa7cc..7a6c429452 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java
@@ -39,7 +39,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.hamcrest.Matchers.is;
 
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1, numClientNodes = 0)
-public class ClusterStatsTests extends ElasticsearchIntegrationTest {
+public class ClusterStatsIT extends ElasticsearchIntegrationTest {
 
     private void assertCounts(ClusterStatsNodes.Counts counts, int total, int masterOnly, int dataOnly, int masterData, int client) {
         assertThat(counts.getTotal(), Matchers.equalTo(total));
diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java
index 004f2c85da..5a9ccd6a0b 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java
@@ -28,7 +28,7 @@ import java.util.Arrays;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.*;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class PendingTasksBlocksTests extends ElasticsearchIntegrationTest {
+public class PendingTasksBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testPendingTasksWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java
index aad405a395..8aa22ee915 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java
@@ -31,7 +31,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFa
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class ClearIndicesCacheBlocksTests extends ElasticsearchIntegrationTest {
+public class ClearIndicesCacheBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testClearIndicesCacheWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java
index 5b020f2ab3..c105450c1c 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*;
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ClusterScope(scope = Scope.TEST)
-public class CreateIndexTests extends ElasticsearchIntegrationTest{
+public class CreateIndexIT extends ElasticsearchIntegrationTest{
 
     @Test
     public void testCreationDate_Given() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java
index 6973f63a22..f5993c4b13 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class DeleteIndexBlocksTests extends ElasticsearchIntegrationTest{
+public class DeleteIndexBlocksIT extends ElasticsearchIntegrationTest{
 
     @Test
     public void testDeleteIndexWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java
index b9fa6bcd8b..df2321af5d 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java
@@ -31,7 +31,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFa
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class FlushBlocksTests extends ElasticsearchIntegrationTest {
+public class FlushBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testFlushWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java
index e8d24c774e..2926ed80b8 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java
@@ -42,7 +42,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc
 import static org.hamcrest.Matchers.*;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class GetIndexTests extends ElasticsearchIntegrationTest {
+public class GetIndexIT extends ElasticsearchIntegrationTest {
 
     private static final String[] allFeatures = { "_alias", "_aliases", "_mapping", "_mappings", "_settings", "_warmer", "_warmers" };
 
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksIT.java
index 47b5fbe0da..d4122e3ebf 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksIT.java
@@ -31,7 +31,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFa
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class OptimizeBlocksTests extends ElasticsearchIntegrationTest {
+public class OptimizeBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testOptimizeWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java
index fc83f96eb3..6143d93350 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java
@@ -32,7 +32,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFa
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class RefreshBlocksTests extends ElasticsearchIntegrationTest {
+public class RefreshBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testRefreshWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java
index a3f2f9f104..efe632d190 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java
@@ -30,7 +30,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class IndicesSegmentsBlocksTests extends ElasticsearchIntegrationTest {
+public class IndicesSegmentsBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testIndicesSegmentsWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java
index 4189455e78..13c273b93b 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java
@@ -49,7 +49,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTi
 import static org.hamcrest.Matchers.*;
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class IndicesShardStoreRequestTests extends ElasticsearchIntegrationTest {
+public class IndicesShardStoreRequestIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testEmpty() {
diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java
index d6dba10e69..fa8ff594dc 100644
--- a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java
@@ -30,7 +30,7 @@ import java.util.Arrays;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.*;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class IndicesStatsBlocksTests extends ElasticsearchIntegrationTest {
+public class IndicesStatsBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testIndicesStatsWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java
index ea25cfb767..cd52f6a3a7 100644
--- a/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath;
 
-public class BulkIntegrationTests extends ElasticsearchIntegrationTest {
+public class BulkIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testBulkIndexCreatesMapping() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsTests.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java
index d450d2399c..be6fcca12d 100644
--- a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsTests.java
+++ b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java
@@ -26,7 +26,7 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import org.junit.Test;
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class BulkProcessorClusterSettingsTests extends ElasticsearchIntegrationTest {
+public class BulkProcessorClusterSettingsIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testBulkProcessorAutoCreateRestrictions() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java
index 358ffb820f..0e50dfdcc4 100644
--- a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java
+++ b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java
@@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.*;
 
-public class BulkProcessorTests extends ElasticsearchIntegrationTest {
+public class BulkProcessorIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testThatBulkProcessorCountIsCorrect() throws InterruptedException {
diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java b/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqIT.java
index 7021885b2d..0dca5ab5e0 100644
--- a/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqTests.java
+++ b/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqIT.java
@@ -38,7 +38,7 @@ import java.io.IOException;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.equalTo;
 
-public class GetTermVectorsCheckDocFreqTests extends ElasticsearchIntegrationTest {
+public class GetTermVectorsCheckDocFreqIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfShards() {
diff --git a/core/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java b/core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java
index 4ff70bf88d..70eba66259 100644
--- a/core/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java
+++ b/core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java
@@ -69,7 +69,7 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @Slow
-public class IndexAliasesTests extends ElasticsearchIntegrationTest {
+public class IndexAliasesIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testAliases() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java b/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java
index b70ba62541..f9ad7749d6 100644
--- a/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java
@@ -36,7 +36,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.hamcrest.Matchers.notNullValue;
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class SimpleBlocksTests extends ElasticsearchIntegrationTest {
+public class SimpleBlocksIT extends ElasticsearchIntegrationTest {
     
     @Test
     public void verifyIndexAndClusterReadOnly() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java b/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java
index baaa5045be..f961acc2b8 100644
--- a/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java
+++ b/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java
@@ -35,7 +35,7 @@ import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.equalTo;
 
-public class BroadcastActionsTests extends ElasticsearchIntegrationTest {
+public class BroadcastActionsIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int maximumNumberOfReplicas() {
diff --git a/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java b/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java
index 76d44642e4..94cebcc677 100644
--- a/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java
+++ b/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java
@@ -72,7 +72,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
 @LuceneTestCase.SuppressFileSystems("ExtrasFS")
 @LuceneTestCase.Slow
-public class OldIndexBackwardsCompatibilityTests extends ElasticsearchIntegrationTest {
+public class OldIndexBackwardsCompatibilityIT extends ElasticsearchIntegrationTest {
     // TODO: test for proper exception on unsupported indexes (maybe via separate test?)
     // We have a 0.20.6.zip etc for this.
 
diff --git a/core/src/test/java/org/elasticsearch/client/node/NodeClientTests.java b/core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java
index 265b9184a2..7d8f15ffd8 100644
--- a/core/src/test/java/org/elasticsearch/client/node/NodeClientTests.java
+++ b/core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java
@@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.is;
  *
  */
 @ClusterScope(scope = Scope.SUITE)
-public class NodeClientTests extends ElasticsearchIntegrationTest {
+public class NodeClientIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java
index 70f96f2ede..0c0d1c2a97 100644
--- a/core/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java
+++ b/core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java
@@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.startsWith;
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 1.0)
-public class TransportClientTests extends ElasticsearchIntegrationTest {
+public class TransportClientIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testPickingUpChangesInDiscoveryNode() {
diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java
index 6557b81029..8e7a378a80 100644
--- a/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java
+++ b/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java
@@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
 @ClusterScope(scope = Scope.TEST, numClientNodes = 0)
 @TestLogging("discovery.zen:TRACE")
-public class TransportClientRetryTests extends ElasticsearchIntegrationTest {
+public class TransportClientRetryIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testRetry() throws IOException, ExecutionException, InterruptedException {
diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java
index 658da8bde3..6c1e4d2026 100644
--- a/core/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
 
-public class ClusterHealthTests extends ElasticsearchIntegrationTest {
+public class ClusterHealthIT extends ElasticsearchIntegrationTest {
 
 
     @Test
diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java
index 699e8ed9d1..96caf28748 100644
--- a/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java
@@ -62,18 +62,18 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
  * Integration tests for the ClusterInfoService collecting information
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
-public class ClusterInfoServiceTests extends ElasticsearchIntegrationTest {
+public class ClusterInfoServiceIT extends ElasticsearchIntegrationTest {
 
     public static class Plugin extends AbstractPlugin {
 
         @Override
         public String name() {
-            return "ClusterInfoServiceTests";
+            return "ClusterInfoServiceIT";
         }
 
         @Override
         public String description() {
-            return "ClusterInfoServiceTests";
+            return "ClusterInfoServiceIT";
         }
 
         public void onModule(ActionModule module) {
diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterServiceIT.java
index 72f1c90110..95c9b3152d 100644
--- a/core/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/ClusterServiceIT.java
@@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class ClusterServiceTests extends ElasticsearchIntegrationTest {
+public class ClusterServiceIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testTimeoutUpdateTask() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java
index be80575717..f8dd1320f0 100644
--- a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java
@@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.is;
 
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 0, numClientNodes = 0)
-public class ClusterStateDiffTests extends ElasticsearchIntegrationTest {
+public class ClusterStateDiffIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testClusterStateDiffSerialization() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java b/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java
index f18954df22..0f07c075c9 100644
--- a/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java
@@ -45,7 +45,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
 import static org.hamcrest.Matchers.*;
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class MinimumMasterNodesTests extends ElasticsearchIntegrationTest {
+public class MinimumMasterNodesIT extends ElasticsearchIntegrationTest {
 
     @Test
     @TestLogging("cluster.service:TRACE,discovery.zen:TRACE,gateway:TRACE,transport.tracer:TRACE")
diff --git a/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java b/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java
index 21e8682bbc..514015df54 100644
--- a/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java
@@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.lessThan;
 /**
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class NoMasterNodeTests extends ElasticsearchIntegrationTest {
+public class NoMasterNodeIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testNoMasterActions() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java b/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
index d3b26ac630..250aca5b5e 100644
--- a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
@@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.*;
  * Checking simple filtering capabilites of the cluster state
  *
  */
-public class SimpleClusterStateTests extends ElasticsearchIntegrationTest {
+public class SimpleClusterStateIT extends ElasticsearchIntegrationTest {
 
     @Before
     public void indexData() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java b/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java
index d02bf477fe..9f2dea3229 100644
--- a/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java
@@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo;
  *
  */
 @ClusterScope(scope= Scope.TEST, numDataNodes =0)
-public class SimpleDataNodesTests extends ElasticsearchIntegrationTest {
+public class SimpleDataNodesIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testDataNodes() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java b/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java
index 54bb8ffafc..076350129d 100644
--- a/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*;
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
 @Slow
-public class SpecificMasterNodesTests extends ElasticsearchIntegrationTest {
+public class SpecificMasterNodesIT extends ElasticsearchIntegrationTest {
 
     protected final Settings.Builder settingsBuilder() {
         return Settings.builder().put("discovery.type", "zen");
diff --git a/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java b/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java
index 416bc90bd2..69cda15e00 100644
--- a/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java
@@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  */
 @ClusterScope(scope= Scope.TEST, numDataNodes =0)
-public class UpdateSettingsValidationTests extends ElasticsearchIntegrationTest {
+public class UpdateSettingsValidationIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testUpdateSettingsValidation() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsTests.java b/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java
index f226959dae..608461b2eb 100644
--- a/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java
@@ -42,7 +42,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = TEST, minNumDataNodes = 2)
-public class AckClusterUpdateSettingsTests extends ElasticsearchIntegrationTest {
+public class AckClusterUpdateSettingsIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/cluster/ack/AckTests.java b/core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java
index f287a95aca..f1eb4850f0 100644
--- a/core/src/test/java/org/elasticsearch/cluster/ack/AckTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java
@@ -57,7 +57,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.hamcrest.Matchers.*;
 
 @ClusterScope(minNumDataNodes = 2)
-public class AckTests extends ElasticsearchIntegrationTest {
+public class AckIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java
index 2bb2802fce..b136f3508b 100644
--- a/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java
@@ -45,9 +45,9 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  */
 @ClusterScope(scope= ElasticsearchIntegrationTest.Scope.TEST, numDataNodes =0, minNumDataNodes = 2)
-public class AwarenessAllocationTests extends ElasticsearchIntegrationTest {
+public class AwarenessAllocationIT extends ElasticsearchIntegrationTest {
 
-    private final ESLogger logger = Loggers.getLogger(AwarenessAllocationTests.class);
+    private final ESLogger logger = Loggers.getLogger(AwarenessAllocationIT.class);
 
     @Override
     protected int numberOfReplicas() {
diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java
index b5181b6488..00a5dc3800 100644
--- a/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java
@@ -61,9 +61,9 @@ import static org.hamcrest.Matchers.hasSize;
 /**
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class ClusterRerouteTests extends ElasticsearchIntegrationTest {
+public class ClusterRerouteIT extends ElasticsearchIntegrationTest {
 
-    private final ESLogger logger = Loggers.getLogger(ClusterRerouteTests.class);
+    private final ESLogger logger = Loggers.getLogger(ClusterRerouteIT.class);
 
     @Test
     public void rerouteWithCommands_disableAllocationSettings() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java
index dbc97dddfb..ab242d487a 100644
--- a/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java
@@ -38,9 +38,9 @@ import static org.elasticsearch.test.ElasticsearchIntegrationTest.*;
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope= Scope.TEST, numDataNodes =0)
-public class FilteringAllocationTests extends ElasticsearchIntegrationTest {
+public class FilteringAllocationIT extends ElasticsearchIntegrationTest {
 
-    private final ESLogger logger = Loggers.getLogger(FilteringAllocationTests.class);
+    private final ESLogger logger = Loggers.getLogger(FilteringAllocationIT.class);
 
     @Test
     public void testDecommissionNodeNoReplicas() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleIT.java
index ac5741e93f..a539c59873 100644
--- a/core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleIT.java
@@ -33,7 +33,7 @@ import static org.elasticsearch.test.ElasticsearchIntegrationTest.*;
 import static org.hamcrest.Matchers.instanceOf;
 
 @ClusterScope(scope= Scope.TEST, numDataNodes =0)
-public class ShardsAllocatorModuleTests extends ElasticsearchIntegrationTest {
+public class ShardsAllocatorModuleIT extends ElasticsearchIntegrationTest {
 
     public void testLoadDefaultShardsAllocator() throws IOException {
         assertAllocatorInstance(Settings.Builder.EMPTY_SETTINGS, BalancedShardsAllocator.class);
diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java
index 06659cbd67..7c06a3ad8d 100644
--- a/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java
@@ -28,7 +28,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.equalTo;
 
-public class SimpleAllocationTests extends ElasticsearchIntegrationTest {
+public class SimpleAllocationIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfShards() {
diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java
index e60ba6cafc..c162142c2a 100644
--- a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java
@@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
-public class DelayedAllocationTests extends ElasticsearchIntegrationTest {
+public class DelayedAllocationIT extends ElasticsearchIntegrationTest {
 
     /**
      * Verifies that when there is no delay timeout, a 1/1 index shard will immediately
diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeIT.java
index 54a8c964e5..3545f3d236 100644
--- a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeIT.java
@@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, minNumDataNodes = 0, maxNumDataNodes = 0)
 @LuceneTestCase.SuppressFileSystems("*") // extra files break the single data cluster expectation when unzipping the static index
-public class RoutingBackwardCompatibilityUponUpgradeTests extends ElasticsearchIntegrationTest {
+public class RoutingBackwardCompatibilityUponUpgradeIT extends ElasticsearchIntegrationTest {
 
     public void testDefaultRouting() throws Exception {
         test("default_routing_1_x", DjbHashFunction.class, false);
diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIntegrationTest.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIT.java
index 12924234ce..5d2f3bcd08 100644
--- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIntegrationTest.java
+++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIT.java
@@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo;
  * works as expected.
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
-public class EnableAllocationDeciderIntegrationTest extends ElasticsearchIntegrationTest {
+public class EnableAllocationDeciderIT extends ElasticsearchIntegrationTest {
 
     public void testEnableRebalance() throws InterruptedException {
         final String firstNode = internalCluster().startNode();
diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java
index f5486cae47..20b1577ace 100644
--- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java
@@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
-public class MockDiskUsagesTests extends ElasticsearchIntegrationTest {
+public class MockDiskUsagesIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java b/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java
index 2faf0dd4b3..926a4e12a9 100644
--- a/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java
@@ -42,7 +42,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc
 import static org.hamcrest.Matchers.*;
 
 @ClusterScope(scope = TEST)
-public class ClusterSettingsTests extends ElasticsearchIntegrationTest {
+public class ClusterSettingsIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void clusterNonExistingSettingsUpdate() {
@@ -209,8 +209,8 @@ public class ClusterSettingsTests extends ElasticsearchIntegrationTest {
 
     private void createNode(Settings settings) {
         internalCluster().startNode(Settings.builder()
-                        .put(ClusterName.SETTING, "ClusterSettingsTests")
-                        .put("node.name", "ClusterSettingsTests")
+                        .put(ClusterName.SETTING, "ClusterSettingsIT")
+                        .put("node.name", "ClusterSettingsIT")
                         .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
                         .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0)
                         .put(EsExecutors.PROCESSORS, 1) // limit the number of threads created
diff --git a/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringTests.java b/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java
index e8876577ce..8bce603658 100644
--- a/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java
@@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
 
 @ClusterScope(scope = SUITE, numDataNodes = 1)
-public class SettingsFilteringTests extends ElasticsearchIntegrationTest {
+public class SettingsFilteringIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java b/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java
index 2daaa66d7e..94635db1ab 100644
--- a/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java
+++ b/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  */
 @ClusterScope(scope= Scope.SUITE, numDataNodes = 2)
-public class ClusterSearchShardsTests extends ElasticsearchIntegrationTest {
+public class ClusterSearchShardsIT extends ElasticsearchIntegrationTest {
     
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java
index 343d7e3041..324d0f2fc3 100644
--- a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java
+++ b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java
@@ -24,7 +24,7 @@ import com.google.common.collect.Sets;
 import org.apache.lucene.util.CollectionUtil;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.TestUtil;
-import org.elasticsearch.bwcompat.OldIndexBackwardsCompatibilityTests;
+import org.elasticsearch.bwcompat.OldIndexBackwardsCompatibilityIT;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.Tuple;
@@ -134,7 +134,7 @@ public class MultiDataPathUpgraderTests extends ElasticsearchTestCase {
      */
     public void testUpgradeRealIndex() throws IOException, URISyntaxException {
         List<Path> indexes = new ArrayList<>();
-        Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityTests.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test
+        Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityIT.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, "index-*.zip")) {
             for (Path path : stream) {
                 indexes.add(path);
@@ -177,7 +177,7 @@ public class MultiDataPathUpgraderTests extends ElasticsearchTestCase {
                 multiDataPath[i++] = nodePath.indicesPath;
             }
             logger.info("--> injecting index [{}] into multiple data paths", indexName);
-            OldIndexBackwardsCompatibilityTests.copyIndex(logger, src, indexName, multiDataPath);
+            OldIndexBackwardsCompatibilityIT.copyIndex(logger, src, indexName, multiDataPath);
             final ShardPath shardPath = new ShardPath(nodeEnvironment.availableShardPaths(new ShardId(indexName, 0))[0], nodeEnvironment.availableShardPaths(new ShardId(indexName, 0))[0], IndexMetaData.INDEX_UUID_NA_VALUE, new ShardId(indexName, 0));
 
             logger.info("{}", FileSystemUtils.files(shardPath.resolveIndex()));
diff --git a/core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java b/core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelIT.java
index 5019f6eaee..bbeef21e05 100644
--- a/core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java
+++ b/core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelIT.java
@@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  *
  */
-public class WriteConsistencyLevelTests extends ElasticsearchIntegrationTest {
+public class WriteConsistencyLevelIT extends ElasticsearchIntegrationTest {
 
 
     @Test
diff --git a/core/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java b/core/src/test/java/org/elasticsearch/count/simple/SimpleCountIT.java
index 59b38b1cf3..de2bb6f0e6 100644
--- a/core/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java
+++ b/core/src/test/java/org/elasticsearch/count/simple/SimpleCountIT.java
@@ -42,7 +42,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.hamcrest.Matchers.is;
 
-public class SimpleCountTests extends ElasticsearchIntegrationTest {
+public class SimpleCountIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testCountRandomPreference() throws InterruptedException, ExecutionException {
diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
index 8a758fe83d..556b902359 100644
--- a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsTests.java
+++ b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
@@ -76,7 +76,7 @@ import static org.hamcrest.Matchers.*;
  */
 @LuceneTestCase.Slow
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 0)
-public class DiscoveryWithServiceDisruptionsTests extends ElasticsearchIntegrationTest {
+public class DiscoveryWithServiceDisruptionsIT extends ElasticsearchIntegrationTest {
 
     private static final TimeValue DISRUPTION_HEALING_OVERHEAD = TimeValue.timeValueSeconds(40); // we use 30s as timeout in many places.
 
diff --git a/core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryTests.java b/core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryIT.java
index dc92507856..6de8d6c310 100644
--- a/core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryTests.java
+++ b/core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryIT.java
@@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
 @Slow
-public class ZenUnicastDiscoveryTests extends ElasticsearchIntegrationTest {
+public class ZenUnicastDiscoveryIT extends ElasticsearchIntegrationTest {
 
     private ClusterDiscoveryConfiguration discoveryConfig;
 
diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java
index 851580f733..4e3108ed28 100644
--- a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryTests.java
+++ b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java
@@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.*;
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, numClientNodes = 0)
 @Slow
-public class ZenDiscoveryTests extends ElasticsearchIntegrationTest {
+public class ZenDiscoveryIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testChangeRejoinOnMasterOptionIsDynamic() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java b/core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java
index 8d757cd7d5..89ea73d56e 100644
--- a/core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java
+++ b/core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java
@@ -26,7 +26,7 @@ import static org.elasticsearch.client.Requests.createIndexRequest;
 /**
  *
  */
-public class AliasedIndexDocumentActionsTests extends DocumentActionsTests {
+public class AliasedIndexDocumentActionsTests extends DocumentActionsIT {
 
     @Override
     protected void createIndex() {
diff --git a/core/src/test/java/org/elasticsearch/document/BulkTests.java b/core/src/test/java/org/elasticsearch/document/BulkIT.java
index e4d3af7cdc..77cbf00565 100644
--- a/core/src/test/java/org/elasticsearch/document/BulkTests.java
+++ b/core/src/test/java/org/elasticsearch/document/BulkIT.java
@@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
-public class BulkTests extends ElasticsearchIntegrationTest {
+public class BulkIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testBulkUpdate_simple() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/document/DocumentActionsTests.java b/core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java
index 47370c2931..404f27224a 100644
--- a/core/src/test/java/org/elasticsearch/document/DocumentActionsTests.java
+++ b/core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java
@@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.nullValue;
 /**
  *
  */
-public class DocumentActionsTests extends ElasticsearchIntegrationTest {
+public class DocumentActionsIT extends ElasticsearchIntegrationTest {
 
     protected void createIndex() {
         createIndex(getConcreteIndexName());
diff --git a/core/src/test/java/org/elasticsearch/document/ShardInfoTests.java b/core/src/test/java/org/elasticsearch/document/ShardInfoIT.java
index 3c587b9be0..0cd41570ec 100644
--- a/core/src/test/java/org/elasticsearch/document/ShardInfoTests.java
+++ b/core/src/test/java/org/elasticsearch/document/ShardInfoIT.java
@@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*;
 
 /**
  */
-public class ShardInfoTests extends ElasticsearchIntegrationTest {
+public class ShardInfoIT extends ElasticsearchIntegrationTest {
 
     private int numCopies;
     private int numNodes;
diff --git a/core/src/test/java/org/elasticsearch/exists/SimpleExistsTests.java b/core/src/test/java/org/elasticsearch/exists/SimpleExistsIT.java
index 85280f06d6..4da69fa51b 100644
--- a/core/src/test/java/org/elasticsearch/exists/SimpleExistsTests.java
+++ b/core/src/test/java/org/elasticsearch/exists/SimpleExistsIT.java
@@ -29,7 +29,7 @@ import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
 import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertExists;
 
-public class SimpleExistsTests extends ElasticsearchIntegrationTest {
+public class SimpleExistsIT extends ElasticsearchIntegrationTest {
 
 
     @Test
diff --git a/core/src/test/java/org/elasticsearch/explain/ExplainActionTests.java b/core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java
index 1f33c5a75b..685c19c688 100644
--- a/core/src/test/java/org/elasticsearch/explain/ExplainActionTests.java
+++ b/core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java
@@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.notNullValue;
 
 /**
  */
-public class ExplainActionTests extends ElasticsearchIntegrationTest {
+public class ExplainActionIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimple() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java b/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationIT.java
index d17c202f96..b8823b0e00 100644
--- a/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*;
 
 /**
  */
-public class FieldStatsIntegrationTests extends ElasticsearchIntegrationTest {
+public class FieldStatsIntegrationIT extends ElasticsearchIntegrationTest {
 
     public void testRandom() throws Exception {
         assertAcked(prepareCreate("test").addMapping(
diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateTests.java b/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java
index 186e05da60..f889200ef6 100644
--- a/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateTests.java
+++ b/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java
@@ -51,9 +51,9 @@ import static org.hamcrest.Matchers.nullValue;
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
 @Slow
-public class GatewayIndexStateTests extends ElasticsearchIntegrationTest {
+public class GatewayIndexStateIT extends ElasticsearchIntegrationTest {
 
-    private final ESLogger logger = Loggers.getLogger(GatewayIndexStateTests.class);
+    private final ESLogger logger = Loggers.getLogger(GatewayIndexStateIT.class);
 
     @Test
     public void testMappingMetaDataParsed() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesTests.java b/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java
index afa3c5b44c..e625f7e98d 100644
--- a/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesTests.java
+++ b/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java
@@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.equalTo;
  */
 @LuceneTestCase.Slow
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class MetaDataWriteDataNodesTests extends ElasticsearchIntegrationTest {
+public class MetaDataWriteDataNodesIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testMetaWrittenAlsoOnDataNode() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayTests.java b/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java
index 0f5a5816c7..c6d8332cc2 100644
--- a/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayTests.java
+++ b/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java
@@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @ClusterScope(numDataNodes =0, scope= Scope.TEST)
-public class QuorumGatewayTests extends ElasticsearchIntegrationTest {
+public class QuorumGatewayIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfReplicas() {
diff --git a/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesTests.java b/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java
index 35bc9fb3e0..ff319e479c 100644
--- a/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesTests.java
+++ b/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java
@@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.hasItem;
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
 @Slow
-public class RecoverAfterNodesTests extends ElasticsearchIntegrationTest {
+public class RecoverAfterNodesIT extends ElasticsearchIntegrationTest {
 
     private final static TimeValue BLOCK_WAIT_TIMEOUT = TimeValue.timeValueSeconds(10);
 
diff --git a/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java b/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java
index be048f1b9a..78455f136c 100644
--- a/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java
+++ b/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java
@@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.*;
  */
 @ClusterScope(numDataNodes = 0, scope = Scope.TEST)
 @Slow
-public class RecoveryFromGatewayTests extends ElasticsearchIntegrationTest {
+public class RecoveryFromGatewayIT extends ElasticsearchIntegrationTest {
 
     @Test
     @Slow
diff --git a/core/src/test/java/org/elasticsearch/get/GetActionTests.java b/core/src/test/java/org/elasticsearch/get/GetActionIT.java
index f04839b55f..c76c77e2f1 100644
--- a/core/src/test/java/org/elasticsearch/get/GetActionTests.java
+++ b/core/src/test/java/org/elasticsearch/get/GetActionIT.java
@@ -56,7 +56,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.*;
 
-public class GetActionTests extends ElasticsearchIntegrationTest {
+public class GetActionIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void simpleGetTests() {
diff --git a/core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortTests.java b/core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortIT.java
index d2466ac649..4df65284c6 100644
--- a/core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortTests.java
+++ b/core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortIT.java
@@ -33,7 +33,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.*;
 
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1)
-public class HttpPublishPortTests extends ElasticsearchIntegrationTest {
+public class HttpPublishPortIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIntegrationTest.java b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIT.java
index 0d8ba52666..0c789b860a 100644
--- a/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIntegrationTest.java
+++ b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIT.java
@@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 1)
-public class NettyPipeliningDisabledIntegrationTest extends ElasticsearchIntegrationTest {
+public class NettyPipeliningDisabledIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIntegrationTest.java b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIT.java
index b3f8479936..1901bdaec0 100644
--- a/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIntegrationTest.java
+++ b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIT.java
@@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.is;
 
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 1)
-public class NettyPipeliningEnabledIntegrationTest extends ElasticsearchIntegrationTest {
+public class NettyPipeliningEnabledIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java b/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java
index e77242cfea..6ffb789c49 100644
--- a/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java
+++ b/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java
@@ -31,7 +31,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
-public class IndexRequestBuilderTests extends ElasticsearchIntegrationTest {
+public class IndexRequestBuilderIT extends ElasticsearchIntegrationTest {
     
     
     @Test
diff --git a/core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java b/core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasIT.java
index a68a1654fe..d0a7e3f9f6 100644
--- a/core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java
+++ b/core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasIT.java
@@ -66,7 +66,7 @@ import static org.hamcrest.Matchers.*;
  * Tests for indices that use shadow replicas and a shared filesystem
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
-public class IndexWithShadowReplicasTests extends ElasticsearchIntegrationTest {
+public class IndexWithShadowReplicasIT extends ElasticsearchIntegrationTest {
 
     private Settings nodeSettings() {
         return Settings.builder()
diff --git a/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresTest.java b/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresIT.java
index b6ef53db87..6d3d63a8ef 100644
--- a/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresTest.java
+++ b/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresIT.java
@@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.equalTo;
  * Test failure when index replication actions fail mid-flight
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, transportClientRatio = 0)
-public class TransportIndexFailuresTest extends ElasticsearchIntegrationTest {
+public class TransportIndexFailuresIT extends ElasticsearchIntegrationTest {
 
     private static final Settings nodeSettings = Settings.settingsBuilder()
             .put("discovery.type", "zen") // <-- To override the local setting if set externally
diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineIntegrationTest.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineIT.java
index 9f46af7626..ebd6965eb3 100644
--- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineIntegrationTest.java
+++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineIT.java
@@ -32,7 +32,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-public class InternalEngineIntegrationTest extends ElasticsearchIntegrationTest {
+public class InternalEngineIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSetIndexCompoundOnFlush() {
diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java
index 226005ca01..c0b21d685a 100644
--- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeTests.java
+++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java
@@ -43,7 +43,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFa
 /**
  */
 @ClusterScope(numDataNodes = 1, scope = Scope.SUITE)
-public class InternalEngineMergeTests extends ElasticsearchIntegrationTest {
+public class InternalEngineMergeIT extends ElasticsearchIntegrationTest {
 
     @Test
     @Slow
diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
index a64fddb503..befd7b94f2 100644
--- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
+++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
@@ -40,7 +40,7 @@ import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.TestUtil;
 import org.elasticsearch.Version;
-import org.elasticsearch.bwcompat.OldIndexBackwardsCompatibilityTests;
+import org.elasticsearch.bwcompat.OldIndexBackwardsCompatibilityIT;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.Base64;
 import org.elasticsearch.common.Nullable;
@@ -1750,7 +1750,7 @@ public class InternalEngineTests extends ElasticsearchTestCase {
 
     public void testUpgradeOldIndex() throws IOException {
         List<Path> indexes = new ArrayList<>();
-        Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityTests.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test
+        Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityIT.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, "index-*.zip")) {
             for (Path path : stream) {
                 indexes.add(path);
diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationIT.java
index eeab72920e..602ab03498 100644
--- a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationIT.java
@@ -36,7 +36,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.terms;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 
-public class FieldDataFilterIntegrationTests extends ElasticsearchIntegrationTest {
+public class FieldDataFilterIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfReplicas() {
diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java
index b3b820be0f..07fa7e44c3 100644
--- a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingTests.java
+++ b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java
@@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.greaterThan;
 
 /**
  */
-public class FieldDataLoadingTests extends ElasticsearchIntegrationTest {
+public class FieldDataLoadingIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testEagerFieldDataLoading() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationIT.java
index 32da43da40..9d0ae62a31 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationIT.java
@@ -30,7 +30,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
 
-public class DynamicMappingIntegrationTests extends ElasticsearchIntegrationTest {
+public class DynamicMappingIntegrationIT extends ElasticsearchIntegrationTest {
 
     public void testConflictingDynamicMappings() {
         // we don't use indexRandom because the order of requests is important here
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIntegrationTest.java b/core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIT.java
index 443ce1b39f..fb0bdf8855 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIntegrationTest.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIT.java
@@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.not;
  * Tests for transforming the source document before indexing.
  */
 @SuppressCodecs("*") // requires custom completion format
-public class TransformOnIndexMapperIntegrationTest extends ElasticsearchIntegrationTest {
+public class TransformOnIndexMapperIT extends ElasticsearchIntegrationTest {
     @Test
     public void searchOnTransformed() throws Exception {
         setup(true);
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationIT.java
index d30fa25a99..5265b1b640 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationIT.java
@@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo;
 
 /**
  */
-public class CopyToMapperIntegrationTests extends ElasticsearchIntegrationTest {
+public class CopyToMapperIntegrationIT extends ElasticsearchIntegrationTest {
 
 
     @Test
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationIT.java
index ffbe671580..d9f02ec123 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationIT.java
@@ -42,7 +42,7 @@ import java.util.List;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.*;
 
-public class TokenCountFieldMapperIntegrationTests extends ElasticsearchIntegrationTest {
+public class TokenCountFieldMapperIntegrationIT extends ElasticsearchIntegrationTest {
     @ParametersFactory
     public static Iterable<Object[]> buildParameters() {
         List<Object[]> parameters = new ArrayList<>();
@@ -57,7 +57,7 @@ public class TokenCountFieldMapperIntegrationTests extends ElasticsearchIntegrat
     private final boolean storeCountedFields;
     private final boolean loadCountedFields;
 
-    public TokenCountFieldMapperIntegrationTests(@Name("storeCountedFields") boolean storeCountedFields,
+    public TokenCountFieldMapperIntegrationIT(@Name("storeCountedFields") boolean storeCountedFields,
             @Name("loadCountedFields") boolean loadCountedFields) {
         this.storeCountedFields = storeCountedFields;
         this.loadCountedFields = loadCountedFields;
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationIT.java
index 44bc5541b7..4eed5a677b 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationIT.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
 
-public class ExternalValuesMapperIntegrationTests extends ElasticsearchIntegrationTest {
+public class ExternalValuesMapperIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationIT.java
index 60609d82b1..ee38e42b83 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationIT.java
@@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.*;
 
 /**
  */
-public class MultiFieldsIntegrationTests extends ElasticsearchIntegrationTest {
+public class MultiFieldsIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testMultiFields() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationTests.java b/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationIT.java
index 55e763065a..9d574574ed 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationIT.java
@@ -32,7 +32,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.*;
 
-public class SizeMappingIntegrationTests extends ElasticsearchIntegrationTest {
+public class SizeMappingIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Test // issue 5053
     public void testThatUpdatingMappingShouldNotRemoveSizeMappingConfiguration() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java b/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterIT.java
index e12efa6a58..923473c8b7 100644
--- a/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterTests.java
+++ b/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterIT.java
@@ -36,7 +36,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
-public class UpdateMappingOnClusterTests extends ElasticsearchIntegrationTest {
+public class UpdateMappingOnClusterIT extends ElasticsearchIntegrationTest {
 
     private static final String INDEX = "index";
     private static final String TYPE = "type";
diff --git a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryIT.java
index 84cf99fe3f..d1fb07e714 100644
--- a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java
+++ b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryIT.java
@@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.is;
  * Full integration test of the template query plugin.
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
-public class TemplateQueryTest extends ElasticsearchIntegrationTest {
+public class TemplateQueryIT extends ElasticsearchIntegrationTest {
 
     @Before
     public void setup() throws IOException {
diff --git a/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserTests.java b/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java
index 9e396b7e8d..080998c97a 100644
--- a/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserTests.java
+++ b/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java
@@ -36,7 +36,7 @@ import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.hamcrest.Matchers.instanceOf;
 
-public class CustomQueryParserTests extends ElasticsearchIntegrationTest {
+public class CustomQueryParserIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedFileTest.java b/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java
index ff19add418..5a37666da7 100644
--- a/core/src/test/java/org/elasticsearch/index/store/CorruptedFileTest.java
+++ b/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java
@@ -90,7 +90,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
-public class CorruptedFileTest extends ElasticsearchIntegrationTest {
+public class CorruptedFileIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogTests.java b/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java
index 9968e742cb..1e35a9656e 100644
--- a/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogTests.java
+++ b/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java
@@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.notNullValue;
  * Integration test for corrupted translog files
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope= ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 0)
-public class CorruptedTranslogTests extends ElasticsearchIntegrationTest {
+public class CorruptedTranslogIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryTests.java b/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java
index 916e7310b6..d1beafd827 100644
--- a/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryTests.java
+++ b/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java
@@ -48,7 +48,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
-public class ExceptionRetryTests extends ElasticsearchIntegrationTest {
+public class ExceptionRetryIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsTests.java b/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java
index 7609de746f..ed189eb54a 100644
--- a/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsTests.java
+++ b/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java
@@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.*;
 /**
  */
 @ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2)
-public class SuggestStatsTests extends ElasticsearchIntegrationTest {
+public class SuggestStatsIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfReplicas() {
diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
index 416a2ea760..26b444764e 100644
--- a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
+++ b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
@@ -29,7 +29,7 @@ import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.TestUtil;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.Version;
-import org.elasticsearch.bwcompat.OldIndexBackwardsCompatibilityTests;
+import org.elasticsearch.bwcompat.OldIndexBackwardsCompatibilityIT;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.io.FileSystemUtils;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
@@ -1142,7 +1142,7 @@ public class TranslogTests extends ElasticsearchTestCase {
 
     public void testUpgradeOldTranslogFiles() throws IOException {
         List<Path> indexes = new ArrayList<>();
-        Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityTests.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test
+        Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityIT.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, "index-*.zip")) {
             for (Path path : stream) {
                 indexes.add(path);
diff --git a/core/src/test/java/org/elasticsearch/indexing/IndexActionTests.java b/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java
index 9201e1c381..1af1cd5889 100644
--- a/core/src/test/java/org/elasticsearch/indexing/IndexActionTests.java
+++ b/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java
@@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo;
 /**
  *
  */
-public class IndexActionTests extends ElasticsearchIntegrationTest {
+public class IndexActionIT extends ElasticsearchIntegrationTest {
 
     /**
      * This test tries to simulate load while creating an index and indexing documents
diff --git a/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java b/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java
index b49f7ab535..8077d21642 100644
--- a/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java
+++ b/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java
@@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class IndexLifecycleActionTests extends ElasticsearchIntegrationTest {
+public class IndexLifecycleActionIT extends ElasticsearchIntegrationTest {
 
     @Slow
     @Test
diff --git a/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationTests.java b/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java
index 42fd8fa273..0531e3942a 100644
--- a/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java
@@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
-public class DateMathIndexExpressionsIntegrationTests extends ElasticsearchIntegrationTest {
+public class DateMathIndexExpressionsIntegrationIT extends ElasticsearchIntegrationTest {
 
     public void testIndexNameDateMathExpressions() {
         DateTime now = new DateTime(DateTimeZone.UTC);
diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathIT.java
index a6513b6968..b3deb7de47 100644
--- a/core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathIT.java
@@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  * Tests for custom data path locations and templates
  */
-public class IndicesCustomDataPathTests extends ElasticsearchIntegrationTest {
+public class IndicesCustomDataPathIT extends ElasticsearchIntegrationTest {
 
     private String path;
 
diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java
index 05756388a6..a2e8fbaf7e 100644
--- a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java
@@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.hasSize;
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class IndicesLifecycleListenerTests extends ElasticsearchIntegrationTest {
+public class IndicesLifecycleListenerIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testBeforeIndexAddedToCluster() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java
index ff0110b39f..f9eeb7fef4 100644
--- a/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java
@@ -64,7 +64,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.hamcrest.Matchers.*;
 
-public class IndicesOptionsIntegrationTests extends ElasticsearchIntegrationTest {
+public class IndicesOptionsIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSpecifiedIndexUnavailable_multipleIndices() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationTests.java b/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java
index 1bffc1ed4a..74143af252 100644
--- a/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java
@@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.notNullValue;
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
 @ElasticsearchBackwardsCompatIntegrationTest.CompatibilityVersion(version = Version.V_1_2_0_ID) // we throw an exception if we create an index with _field_names that is 1.3
-public class PreBuiltAnalyzerIntegrationTests extends ElasticsearchIntegrationTest {
+public class PreBuiltAnalyzerIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java b/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java
index 2537b53b0f..119d5d2f9f 100644
--- a/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java
@@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.*;
 /**
  *
  */
-public class AnalyzeActionTests extends ElasticsearchIntegrationTest {
+public class AnalyzeActionIT extends ElasticsearchIntegrationTest {
     
     @Test
     public void simpleAnalyzerTests() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java b/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceIT.java
index 46a6505a51..da813f96b6 100644
--- a/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.notNullValue;
  *
  */
 @ClusterScope(scope= Scope.TEST, numDataNodes=0)
-public class HunspellServiceTests extends ElasticsearchIntegrationTest {
+public class HunspellServiceIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testLocaleDirectoryWithNodeLevelConfig() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/cache/query/IndicesRequestCacheTests.java b/core/src/test/java/org/elasticsearch/indices/cache/query/IndicesRequestCacheIT.java
index 37ea2ef8d3..5332959fbc 100644
--- a/core/src/test/java/org/elasticsearch/indices/cache/query/IndicesRequestCacheTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/cache/query/IndicesRequestCacheIT.java
@@ -34,7 +34,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
 import static org.hamcrest.Matchers.greaterThan;
 
-public class IndicesRequestCacheTests extends ElasticsearchIntegrationTest {
+public class IndicesRequestCacheIT extends ElasticsearchIntegrationTest {
 
     // One of the primary purposes of the query cache is to cache aggs results
     public void testCacheAggs() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsTests.java b/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java
index b0a549f3cc..5f65990ffe 100644
--- a/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java
@@ -30,7 +30,7 @@ import java.util.Arrays;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.*;
 import static org.hamcrest.Matchers.equalTo;
 
-public class IndicesExistsTests extends ElasticsearchIntegrationTest {
+public class IndicesExistsIT extends ElasticsearchIntegrationTest {
 
     @Test
     // Indices exists never throws IndexMissingException, the indices options control its behaviour (return true or false)
diff --git a/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java b/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java
index 0191c56831..261698d1d8 100644
--- a/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java
@@ -36,7 +36,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked;
 import static org.hamcrest.Matchers.equalTo;
 
-public class TypesExistsTests extends ElasticsearchIntegrationTest {
+public class TypesExistsIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimple() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/flush/FlushTest.java b/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java
index 5ce34ca4fa..f3c2977685 100644
--- a/core/src/test/java/org/elasticsearch/indices/flush/FlushTest.java
+++ b/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import static org.hamcrest.Matchers.emptyIterable;
 import static org.hamcrest.Matchers.equalTo;
 
-public class FlushTest extends ElasticsearchIntegrationTest {
+public class FlushIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testWaitIfOngoing() throws InterruptedException {
diff --git a/core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java b/core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksIT.java
index 3e73a52fb4..50c9827c2d 100644
--- a/core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksIT.java
@@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.nullValue;
 /**
  */
 @ClusterScope(scope= Scope.TEST, numDataNodes =1)
-public class IndicesLeaksTests extends ElasticsearchIntegrationTest {
+public class IndicesLeaksIT extends ElasticsearchIntegrationTest {
 
 
     @SuppressWarnings({"ConstantConditions", "unchecked"})
diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java
index 673bd140d0..a418325e36 100644
--- a/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java
@@ -41,7 +41,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
 import static org.hamcrest.Matchers.emptyIterable;
 
 @ElasticsearchIntegrationTest.ClusterScope(randomDynamicTemplates = false) // this test takes a long time to delete the idx if all fields are eager loading
-public class ConcurrentDynamicTemplateTests extends ElasticsearchIntegrationTest {
+public class ConcurrentDynamicTemplateIT extends ElasticsearchIntegrationTest {
 
     private final String mappingType = "test-mapping";
 
diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingTests.java
index 2b7e7a0e77..1800c94f9e 100644
--- a/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingTests.java
@@ -31,7 +31,7 @@ import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
  */
 @Slow
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class DedicatedMasterGetFieldMappingTests extends SimpleGetFieldMappingsTests {
+public class DedicatedMasterGetFieldMappingTests extends SimpleGetFieldMappingsIT {
 
     @Before
     public void before1() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java
index 3a97dcf736..1cdd368961 100644
--- a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java
@@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked;
 import static org.hamcrest.Matchers.*;
 
-public class SimpleGetFieldMappingsTests extends ElasticsearchIntegrationTest {
+public class SimpleGetFieldMappingsIT extends ElasticsearchIntegrationTest {
     
     public void testGetMappingsWhereThereAreNone() {
         createIndex("index");
diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java
index 4757aea860..90437638a9 100644
--- a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java
@@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.notNullValue;
  *
  */
 @ClusterScope(randomDynamicTemplates = false)
-public class SimpleGetMappingsTests extends ElasticsearchIntegrationTest {
+public class SimpleGetMappingsIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void getMappingsWhereThereAreNone() {
diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationTests.java b/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
index e9aef35358..080a65b82c 100644
--- a/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
@@ -50,7 +50,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
 @ClusterScope(randomDynamicTemplates = false)
-public class UpdateMappingIntegrationTests extends ElasticsearchIntegrationTest {
+public class UpdateMappingIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void dynamicUpdates() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java b/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerIT.java
index 6914bcb95d..850d899343 100644
--- a/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerIT.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
-public class IndexingMemoryControllerTests extends ElasticsearchIntegrationTest {
+public class IndexingMemoryControllerIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testIndexBufferSizeUpdateAfterCreationRemoval() throws InterruptedException {
@@ -138,8 +138,8 @@ public class IndexingMemoryControllerTests extends ElasticsearchIntegrationTest
 
     private void createNode(Settings settings) {
         internalCluster().startNode(Settings.builder()
-                        .put(ClusterName.SETTING, "IndexingMemoryControllerTests")
-                        .put("node.name", "IndexingMemoryControllerTests")
+                        .put(ClusterName.SETTING, "IndexingMemoryControllerIT")
+                        .put("node.name", "IndexingMemoryControllerIT")
                         .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
                         .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0)
                         .put(EsExecutors.PROCESSORS, 1) // limit the number of threads created
diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopTests.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java
index 23ff0709c6..3d96ff9a1e 100644
--- a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java
@@ -38,7 +38,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 
 /** Tests for the noop breakers, which are non-dynamic settings */
 @ElasticsearchIntegrationTest.ClusterScope(scope=ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes=0)
-public class CircuitBreakerNoopTests extends ElasticsearchIntegrationTest {
+public class CircuitBreakerNoopIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceTests.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java
index 878a9aaf4c..6bbd5673da 100644
--- a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java
@@ -63,7 +63,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
  * Integration tests for InternalCircuitBreakerService
  */
 @ClusterScope(scope = TEST, randomDynamicTemplates = false)
-public class CircuitBreakerServiceTests extends ElasticsearchIntegrationTest {
+public class CircuitBreakerServiceIT extends ElasticsearchIntegrationTest {
 
     /** Reset all breaker settings back to their defaults */
     private void reset() {
diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerTests.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java
index 7b2a12f8f9..9703d36a64 100644
--- a/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java
@@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  * Tests for the circuit breaker while random exceptions are happening
  */
-public class RandomExceptionCircuitBreakerTests extends ElasticsearchIntegrationTest {
+public class RandomExceptionCircuitBreakerIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testBreakerWithRandomExceptions() throws IOException, InterruptedException, ExecutionException {
diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryTests.java b/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java
index 0adbcbeb83..e1f1d7ec0a 100644
--- a/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java
@@ -73,7 +73,7 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class IndexRecoveryTests extends ElasticsearchIntegrationTest {
+public class IndexRecoveryIT extends ElasticsearchIntegrationTest {
 
     private static final String INDEX_NAME = "test-idx-1";
     private static final String INDEX_TYPE = "test-type-1";
diff --git a/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksTests.java b/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java
index 70783a8efb..3e0d128295 100644
--- a/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java
@@ -32,7 +32,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
-public class GetSettingsBlocksTests extends ElasticsearchIntegrationTest {
+public class GetSettingsBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testGetSettingsWithBlocks() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java b/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java
index 3eb35db9cc..ac6ba50d23 100644
--- a/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java
@@ -38,7 +38,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
 import static org.hamcrest.Matchers.equalTo;
 
 @ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2)
-public class UpdateNumberOfReplicasTests extends ElasticsearchIntegrationTest {
+public class UpdateNumberOfReplicasIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int maximumNumberOfReplicas() {
@@ -46,7 +46,7 @@ public class UpdateNumberOfReplicasTests extends ElasticsearchIntegrationTest {
     }
 
     @Test
-    public void simpleUpdateNumberOfReplicasTests() throws Exception {
+    public void simpleUpdateNumberOfReplicasIT() throws Exception {
         logger.info("Creating index test");
         assertAcked(prepareCreate("test", 2));
         logger.info("Running Cluster Health");
diff --git a/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java
index ffc437ea67..df73f01cf0 100644
--- a/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java
@@ -45,7 +45,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
 
-public class UpdateSettingsTests extends ElasticsearchIntegrationTest {
+public class UpdateSettingsIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testOpenCloseUpdateSettings() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java b/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java
index ec06057578..419d850ce7 100644
--- a/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java
@@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 
 @ClusterScope(scope= Scope.TEST, numDataNodes =2)
-public class CloseIndexDisableCloseAllTests extends ElasticsearchIntegrationTest {
+public class CloseIndexDisableCloseAllIT extends ElasticsearchIntegrationTest {
 
     @Test
     // Combined multiple tests into one, because cluster scope is test.
diff --git a/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java b/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java
index d1b461ef20..11cb30e955 100644
--- a/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java
@@ -46,7 +46,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 
-public class OpenCloseIndexTests extends ElasticsearchIntegrationTest {
+public class OpenCloseIndexIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimpleCloseOpen() {
diff --git a/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateTests.java b/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java
index 2792c77870..36144b0fcd 100644
--- a/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java
@@ -65,7 +65,7 @@ import static org.hamcrest.Matchers.*;
 /**
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0)
-public class RareClusterStateTests extends ElasticsearchIntegrationTest {
+public class RareClusterStateIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfShards() {
diff --git a/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java b/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java
index 0d162b7c52..b6f24e5c6c 100644
--- a/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java
@@ -45,9 +45,9 @@ import static org.hamcrest.Matchers.nullValue;
  *
  */
 @ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2)
-public class SimpleIndexStateTests extends ElasticsearchIntegrationTest {
+public class SimpleIndexStateIT extends ElasticsearchIntegrationTest {
 
-    private final ESLogger logger = Loggers.getLogger(SimpleIndexStateTests.class);
+    private final ESLogger logger = Loggers.getLogger(SimpleIndexStateIT.class);
 
     @Test
     public void testSimpleOpenClose() {
diff --git a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsTests.java b/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java
index ad446251db..5a2885f4a9 100644
--- a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java
@@ -72,7 +72,7 @@ import static org.hamcrest.Matchers.nullValue;
 
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 2, numClientNodes = 0, randomDynamicTemplates = false)
 @SuppressCodecs("*") // requires custom completion format
-public class IndexStatsTests extends ElasticsearchIntegrationTest {
+public class IndexStatsIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java
index ac43f0e8a8..c844e52bb9 100644
--- a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java
@@ -72,7 +72,7 @@ import static org.hamcrest.Matchers.equalTo;
  *
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class IndicesStoreIntegrationTests extends ElasticsearchIntegrationTest {
+public class IndicesStoreIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) { // simplify this and only use a single data path
diff --git a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksTests.java b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java
index e8fddf2c1a..28a6043479 100644
--- a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java
@@ -32,7 +32,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc
 import static org.hamcrest.Matchers.hasSize;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class IndexTemplateBlocksTests extends ElasticsearchIntegrationTest {
+public class IndexTemplateBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testIndexTemplatesWithBlocks() throws IOException {
diff --git a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringTests.java b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringIT.java
index d09761c5a5..5c8582287f 100644
--- a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ClusterScope(scope = Scope.SUITE)
-public class IndexTemplateFilteringTests extends ElasticsearchIntegrationTest{
+public class IndexTemplateFilteringIT extends ElasticsearchIntegrationTest{
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java b/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java
index 366a4cb96f..0d5921f115 100644
--- a/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java
@@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.*;
 /**
  *
  */
-public class SimpleIndexTemplateTests extends ElasticsearchIntegrationTest {
+public class SimpleIndexTemplateIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void simpleIndexTemplateTests() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerTests.java b/core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerIT.java
index b63a8273c8..381141e2d6 100644
--- a/core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerIT.java
@@ -39,9 +39,9 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  */
 @ClusterScope(numDataNodes =0, scope= Scope.TEST)
-public class GatewayIndicesWarmerTests extends ElasticsearchIntegrationTest {
+public class GatewayIndicesWarmerIT extends ElasticsearchIntegrationTest {
 
-    private final ESLogger logger = Loggers.getLogger(GatewayIndicesWarmerTests.class);
+    private final ESLogger logger = Loggers.getLogger(GatewayIndicesWarmerIT.class);
 
     @Test
     public void testStatePersistence() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksTests.java b/core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksIT.java
index a2735d6134..8337307e2b 100644
--- a/core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksIT.java
@@ -38,7 +38,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class IndicesWarmerBlocksTests extends ElasticsearchIntegrationTest {
+public class IndicesWarmerBlocksIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testPutWarmerWithBlocks() {
diff --git a/core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java b/core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerIT.java
index f8ac6c156f..98ee75cc2f 100644
--- a/core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java
+++ b/core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerIT.java
@@ -51,7 +51,7 @@ import java.util.Locale;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.*;
 
-public class SimpleIndicesWarmerTests extends ElasticsearchIntegrationTest {
+public class SimpleIndicesWarmerIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void simpleWarmerTests() {
diff --git a/core/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java b/core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java
index 2003876389..cf67024ad9 100644
--- a/core/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java
+++ b/core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java
@@ -38,7 +38,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.*;
 
-public class SimpleMgetTests extends ElasticsearchIntegrationTest {
+public class SimpleMgetIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testThatMgetShouldWorkWithOneIndexMissing() throws IOException {
diff --git a/core/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java b/core/src/test/java/org/elasticsearch/nested/SimpleNestedIT.java
index f0cd668e43..1329537cdd 100644
--- a/core/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java
+++ b/core/src/test/java/org/elasticsearch/nested/SimpleNestedIT.java
@@ -51,7 +51,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
-public class SimpleNestedTests extends ElasticsearchIntegrationTest {
+public class SimpleNestedIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void simpleNested() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/network/DirectBufferNetworkTests.java b/core/src/test/java/org/elasticsearch/network/DirectBufferNetworkIT.java
index 979bc8b454..6ebf02bea1 100644
--- a/core/src/test/java/org/elasticsearch/network/DirectBufferNetworkTests.java
+++ b/core/src/test/java/org/elasticsearch/network/DirectBufferNetworkIT.java
@@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
 
 /**
  */
-public class DirectBufferNetworkTests extends ElasticsearchIntegrationTest {
+public class DirectBufferNetworkIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java b/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationIT.java
index 2390e3b9f8..bfd2dc5915 100644
--- a/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationIT.java
@@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class DestructiveOperationsIntegrationTests extends ElasticsearchIntegrationTest {
+public class DestructiveOperationsIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Test
     // One test for test performance, since cluster scope is test
diff --git a/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledTest.java b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledIT.java
index fa8762861e..1835226ca6 100644
--- a/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledTest.java
+++ b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.is;
  * Tests that when disabling detailed errors, a request with the error_trace parameter returns a HTTP 400
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 1)
-public class DetailedErrorsDisabledTest extends ElasticsearchIntegrationTest {
+public class DetailedErrorsDisabledIT extends ElasticsearchIntegrationTest {
 
     // Build our cluster settings
     @Override
diff --git a/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledTest.java b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledIT.java
index 979e362eae..5422f0103a 100644
--- a/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledTest.java
+++ b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledIT.java
@@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.containsString;
  * Tests that by default the error_trace parameter can be used to show stacktraces
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 1)
-public class DetailedErrorsEnabledTest extends ElasticsearchIntegrationTest {
+public class DetailedErrorsEnabledIT extends ElasticsearchIntegrationTest {
 
     // Build our cluster settings
     @Override
diff --git a/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java
index 82e61defa1..08eb692b1c 100644
--- a/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java
+++ b/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java
@@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray;
+import static org.elasticsearch.percolator.PercolatorIT.convertFromTextArray;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.hamcrest.Matchers.*;
@@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.*;
 /**
  *
  */
-public class ConcurrentPercolatorTests extends ElasticsearchIntegrationTest {
+public class ConcurrentPercolatorIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimpleConcurrentPercolator() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/MultiPercolatorIT.java
index 1707f03fb6..d72e0f8ffe 100644
--- a/core/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java
+++ b/core/src/test/java/org/elasticsearch/percolator/MultiPercolatorIT.java
@@ -35,14 +35,14 @@ import java.io.IOException;
 import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuilder;
 import static org.elasticsearch.common.xcontent.XContentFactory.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;
-import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray;
+import static org.elasticsearch.percolator.PercolatorIT.convertFromTextArray;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertMatchCount;
 import static org.hamcrest.Matchers.*;
 
 /**
  */
-public class MultiPercolatorTests extends ElasticsearchIntegrationTest {
+public class MultiPercolatorIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testBasics() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityTests.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityIT.java
index 4c2cfcf487..ada1915842 100644
--- a/core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityTests.java
+++ b/core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityIT.java
@@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.instanceOf;
 
 /**
  */
-public class PercolatorBackwardsCompatibilityTests extends ElasticsearchIntegrationTest {
+public class PercolatorBackwardsCompatibilityIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testPercolatorUpgrading() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsIT.java
index e14dbf60da..a6246bcae3 100644
--- a/core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsTests.java
+++ b/core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsIT.java
@@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.notNullValue;
 /**
  *
  */
-public class PercolatorFacetsAndAggregationsTests extends ElasticsearchIntegrationTest {
+public class PercolatorFacetsAndAggregationsIT extends ElasticsearchIntegrationTest {
 
     @Test
     // Just test the integration with facets and aggregations, not the facet and aggregation functionality!
diff --git a/core/src/test/java/org/elasticsearch/percolator/PercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorIT.java
index 46144a0b39..2b1eb762e9 100644
--- a/core/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
+++ b/core/src/test/java/org/elasticsearch/percolator/PercolatorIT.java
@@ -95,7 +95,7 @@ import static org.hamcrest.Matchers.nullValue;
 /**
  *
  */
-public class PercolatorTests extends ElasticsearchIntegrationTest {
+public class PercolatorIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimple1() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorIT.java
index ec4d65316c..3ed323229b 100644
--- a/core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java
+++ b/core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorIT.java
@@ -47,14 +47,14 @@ import static org.elasticsearch.client.Requests.clusterHealthRequest;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.index.query.QueryBuilders.*;
-import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray;
+import static org.elasticsearch.percolator.PercolatorIT.convertFromTextArray;
 import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
 import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0)
-public class RecoveryPercolatorTests extends ElasticsearchIntegrationTest {
+public class RecoveryPercolatorIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfShards() {
diff --git a/core/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/TTLPercolatorIT.java
index dff850d9bf..066409be0e 100644
--- a/core/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java
+++ b/core/src/test/java/org/elasticsearch/percolator/TTLPercolatorIT.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray;
+import static org.elasticsearch.percolator.PercolatorIT.convertFromTextArray;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertMatchCount;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.hamcrest.Matchers.*;
@@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.*;
 /**
  */
 @ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class TTLPercolatorTests extends ElasticsearchIntegrationTest {
+public class TTLPercolatorIT extends ElasticsearchIntegrationTest {
 
     private static final long PURGE_INTERVAL = 200;
 
diff --git a/core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleTests.java b/core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleIT.java
index 832d04c5d0..da0f647100 100644
--- a/core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleTests.java
+++ b/core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleIT.java
@@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 2)
-public class PluggableTransportModuleTests extends ElasticsearchIntegrationTest {
+public class PluggableTransportModuleIT extends ElasticsearchIntegrationTest {
 
     public static final AtomicInteger SENT_REQUEST_COUNTER = new AtomicInteger(0);
 
diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java
index d0993dba87..34bcbb6d85 100644
--- a/core/src/test/java/org/elasticsearch/plugins/PluginManagerTests.java
+++ b/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java
@@ -64,7 +64,7 @@ import static org.hamcrest.Matchers.*;
 @LuceneTestCase.SuppressFileSystems("*") // TODO: clean up this test to allow extra files
 // TODO: jimfs is really broken here (throws wrong exception from detection method).
 // if its in your classpath, then do not use plugins!!!!!!
-public class PluginManagerTests extends ElasticsearchIntegrationTest {
+public class PluginManagerIT extends ElasticsearchIntegrationTest {
 
     private Tuple<Settings, Environment> initialSettings;
     private CaptureOutputTerminal terminal = new CaptureOutputTerminal();
diff --git a/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginTests.java b/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java
index 96673555e0..1b3260ae5e 100644
--- a/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginTests.java
+++ b/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java
@@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo;
  * Test a rest action that sets special response headers
  */
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1)
-public class ResponseHeaderPluginTests extends ElasticsearchIntegrationTest {
+public class ResponseHeaderPluginIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/plugins/SitePluginTests.java b/core/src/test/java/org/elasticsearch/plugins/SitePluginIT.java
index 254d35253c..505d3ee322 100644
--- a/core/src/test/java/org/elasticsearch/plugins/SitePluginTests.java
+++ b/core/src/test/java/org/elasticsearch/plugins/SitePluginIT.java
@@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.containsString;
  * We want to test site plugins
  */
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1)
-public class SitePluginTests extends ElasticsearchIntegrationTest {
+public class SitePluginIT extends ElasticsearchIntegrationTest {
 
 
     @Override
diff --git a/core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigTests.java b/core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigIT.java
index 78dd680903..86e39bb43c 100644
--- a/core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigTests.java
+++ b/core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigIT.java
@@ -38,7 +38,7 @@ import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasStatus;
 
 @ClusterScope(scope = SUITE, numDataNodes = 1)
-public class SitePluginRelativePathConfigTests extends ElasticsearchIntegrationTest {
+public class SitePluginRelativePathConfigIT extends ElasticsearchIntegrationTest {
 
     private final Path root = PathUtils.get(".").toAbsolutePath().getRoot();
 
diff --git a/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java b/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java
index dd859b46fb..29dd39681e 100644
--- a/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java
+++ b/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java
@@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
  *
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 0.0)
-public class FullRollingRestartTests extends ElasticsearchIntegrationTest {
+public class FullRollingRestartIT extends ElasticsearchIntegrationTest {
 
     protected void assertTimeout(ClusterHealthRequestBuilder requestBuilder) {
         ClusterHealthResponse clusterHealth = requestBuilder.get();
diff --git a/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java b/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java
index cccfe8024b..8570ac3e9a 100644
--- a/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java
+++ b/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java
@@ -45,9 +45,9 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.equalTo;
 
-public class RecoveryWhileUnderLoadTests extends ElasticsearchIntegrationTest {
+public class RecoveryWhileUnderLoadIT extends ElasticsearchIntegrationTest {
 
-    private final ESLogger logger = Loggers.getLogger(RecoveryWhileUnderLoadTests.class);
+    private final ESLogger logger = Loggers.getLogger(RecoveryWhileUnderLoadIT.class);
 
     @Test
     @Slow
diff --git a/core/src/test/java/org/elasticsearch/recovery/RelocationTests.java b/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java
index 4f61be0b27..c59729fba8 100644
--- a/core/src/test/java/org/elasticsearch/recovery/RelocationTests.java
+++ b/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java
@@ -86,7 +86,7 @@ import static org.hamcrest.Matchers.*;
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
 @TestLogging("indices.recovery:TRACE,index.shard.service:TRACE")
-public class RelocationTests extends ElasticsearchIntegrationTest {
+public class RelocationIT extends ElasticsearchIntegrationTest {
     private final TimeValue ACCEPTABLE_RELOCATION_TIME = new TimeValue(5, TimeUnit.MINUTES);
 
     @Override
diff --git a/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java
index f91ce01967..208dfb275f 100644
--- a/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java
+++ b/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java
@@ -31,7 +31,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.equalTo;
 
-public class SimpleRecoveryTests extends ElasticsearchIntegrationTest {
+public class SimpleRecoveryIT extends ElasticsearchIntegrationTest {
 
     @Override
     public Settings indexSettings() {
diff --git a/core/src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryIT.java
index eb2f0af69e..aba0f38af8 100644
--- a/core/src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryTests.java
+++ b/core/src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryIT.java
@@ -24,7 +24,7 @@ import org.elasticsearch.common.settings.Settings;
 /**
  *
  */
-public class SmallFileChunkSizeRecoveryTests extends SimpleRecoveryTests {
+public class SmallFileChunkSizeRecoveryIT extends SimpleRecoveryIT {
 
     @Override
     protected Settings recoverySettings() {
diff --git a/core/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryIT.java
index d565bacfd5..e716736252 100644
--- a/core/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java
+++ b/core/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryIT.java
@@ -24,7 +24,7 @@ import org.elasticsearch.common.settings.Settings;
 /**
  *
  */
-public class SmallTranslogOpsRecoveryTests extends SimpleRecoveryTests {
+public class SmallTranslogOpsRecoveryIT extends SimpleRecoveryIT {
 
     @Override
     protected Settings recoverySettings() {
diff --git a/core/src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryIT.java
index 500b1c74ca..a39849e0f1 100644
--- a/core/src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryTests.java
+++ b/core/src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryIT.java
@@ -24,7 +24,7 @@ import org.elasticsearch.common.settings.Settings;
 /**
  *
  */
-public class SmallTranslogSizeRecoveryTests extends SimpleRecoveryTests {
+public class SmallTranslogSizeRecoveryIT extends SimpleRecoveryIT {
 
     @Override
     protected Settings recoverySettings() {
diff --git a/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryTests.java b/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java
index 02656e9e4e..c407ae64b8 100644
--- a/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryTests.java
+++ b/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java
@@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
 @ElasticsearchIntegrationTest.ClusterScope(numDataNodes = 2, numClientNodes = 0, scope = ElasticsearchIntegrationTest.Scope.TEST)
 @SuppressCodecs("*") // test relies on exact file extensions
-public class TruncatedRecoveryTests extends ElasticsearchIntegrationTest {
+public class TruncatedRecoveryIT extends ElasticsearchIntegrationTest {
 
     protected Settings nodeSettings(int nodeOrdinal) {
         Settings.Builder builder = Settings.builder()
diff --git a/core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultTests.java b/core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultIT.java
index da5da15922..feb57e8740 100644
--- a/core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultTests.java
+++ b/core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultIT.java
@@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.*;
 /**
  *
  */
-public class CorsRegexDefaultTests extends ElasticsearchIntegrationTest {
+public class CorsRegexDefaultIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/rest/CorsRegexTests.java b/core/src/test/java/org/elasticsearch/rest/CorsRegexIT.java
index 8e568d847c..8ef8217e5b 100644
--- a/core/src/test/java/org/elasticsearch/rest/CorsRegexTests.java
+++ b/core/src/test/java/org/elasticsearch/rest/CorsRegexIT.java
@@ -38,9 +38,9 @@ import static org.hamcrest.Matchers.is;
  *
  */
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1)
-public class CorsRegexTests extends ElasticsearchIntegrationTest {
+public class CorsRegexIT extends ElasticsearchIntegrationTest {
 
-    protected static final ESLogger logger = Loggers.getLogger(CorsRegexTests.class);
+    protected static final ESLogger logger = Loggers.getLogger(CorsRegexIT.class);
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java b/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
index 0ebbda7d31..b79ec6a926 100644
--- a/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java
+++ b/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
@@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.nullValue;
 /**
  *
  */
-public class AliasResolveRoutingTests extends ElasticsearchIntegrationTest {
+public class AliasResolveRoutingIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testResolveIndexRouting() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java b/core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java
index ff2a006a04..b596f75f4b 100644
--- a/core/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java
+++ b/core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java
@@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  *
  */
-public class AliasRoutingTests extends ElasticsearchIntegrationTest {
+public class AliasRoutingIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int minimumNumberOfShards() {
diff --git a/core/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java b/core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java
index cca1d2125a..f288a75609 100644
--- a/core/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java
+++ b/core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java
@@ -41,7 +41,7 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.hamcrest.Matchers.*;
 
-public class SimpleRoutingTests extends ElasticsearchIntegrationTest {
+public class SimpleRoutingIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int minimumNumberOfShards() {
diff --git a/core/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java b/core/src/test/java/org/elasticsearch/script/CustomScriptContextIT.java
index 16006429ba..fc92731b28 100644
--- a/core/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java
+++ b/core/src/test/java/org/elasticsearch/script/CustomScriptContextIT.java
@@ -33,7 +33,7 @@ import org.junit.Test;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.notNullValue;
 
-public class CustomScriptContextTests extends ElasticsearchIntegrationTest {
+public class CustomScriptContextIT extends ElasticsearchIntegrationTest {
 
     private static final ImmutableSet<String> LANG_SET = ImmutableSet.of(GroovyScriptEngineService.NAME, MustacheScriptEngineService.NAME, ExpressionScriptEngineService.NAME);
 
diff --git a/core/src/test/java/org/elasticsearch/script/GroovyScriptTests.java b/core/src/test/java/org/elasticsearch/script/GroovyScriptIT.java
index 9ceda548b9..155d0a9cd8 100644
--- a/core/src/test/java/org/elasticsearch/script/GroovyScriptTests.java
+++ b/core/src/test/java/org/elasticsearch/script/GroovyScriptIT.java
@@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  * Various tests for Groovy scripting
  */
-public class GroovyScriptTests extends ElasticsearchIntegrationTest {
+public class GroovyScriptIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testGroovyBigDecimalTransformation() {
diff --git a/core/src/test/java/org/elasticsearch/script/GroovySecurityTests.java b/core/src/test/java/org/elasticsearch/script/GroovySecurityIT.java
index cb1a277102..0ab1a87430 100644
--- a/core/src/test/java/org/elasticsearch/script/GroovySecurityTests.java
+++ b/core/src/test/java/org/elasticsearch/script/GroovySecurityIT.java
@@ -36,7 +36,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
  * Tests for the Groovy security permissions
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
-public class GroovySecurityTests extends ElasticsearchIntegrationTest {
+public class GroovySecurityIT extends ElasticsearchIntegrationTest {
     
     @Override
     public void setUp() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/script/IndexLookupTests.java b/core/src/test/java/org/elasticsearch/script/IndexLookupIT.java
index 84322c73fb..5e4788bdbd 100644
--- a/core/src/test/java/org/elasticsearch/script/IndexLookupTests.java
+++ b/core/src/test/java/org/elasticsearch/script/IndexLookupIT.java
@@ -43,7 +43,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.hamcrest.Matchers.equalTo;
 
-public class IndexLookupTests extends ElasticsearchIntegrationTest {
+public class IndexLookupIT extends ElasticsearchIntegrationTest {
 
     String includeAllFlag = "_FREQUENCIES | _OFFSETS | _PAYLOADS | _POSITIONS | _CACHE";
     String includeAllWithoutRecordFlag = "_FREQUENCIES | _OFFSETS | _PAYLOADS | _POSITIONS ";
diff --git a/core/src/test/java/org/elasticsearch/script/IndexedScriptTests.java b/core/src/test/java/org/elasticsearch/script/IndexedScriptIT.java
index f4696d8f8e..78be0b6fa5 100644
--- a/core/src/test/java/org/elasticsearch/script/IndexedScriptTests.java
+++ b/core/src/test/java/org/elasticsearch/script/IndexedScriptIT.java
@@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 
-public class IndexedScriptTests extends ElasticsearchIntegrationTest {
+public class IndexedScriptIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java b/core/src/test/java/org/elasticsearch/script/OnDiskScriptIT.java
index adc5351d57..4d556b7a99 100644
--- a/core/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java
+++ b/core/src/test/java/org/elasticsearch/script/OnDiskScriptIT.java
@@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo;
 
 //Use Suite scope so that paths get set correctly
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
-public class OnDiskScriptTests extends ElasticsearchIntegrationTest {
+public class OnDiskScriptIT extends ElasticsearchIntegrationTest {
 
     @Override
     public Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/script/ScriptFieldTests.java b/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java
index d50b9573bc..eaddeeba78 100644
--- a/core/src/test/java/org/elasticsearch/script/ScriptFieldTests.java
+++ b/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java
@@ -38,7 +38,7 @@ import static org.elasticsearch.test.ElasticsearchIntegrationTest.*;
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 3)
-public class ScriptFieldTests extends ElasticsearchIntegrationTest {
+public class ScriptFieldIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java b/core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsIT.java
index 1a57c5155e..7b86ea5ba4 100644
--- a/core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsTest.java
+++ b/core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsIT.java
@@ -31,7 +31,7 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class ScriptIndexSettingsTest extends ElasticsearchIntegrationTest{
+public class ScriptIndexSettingsIT extends ElasticsearchIntegrationTest{
 
 
     @Test
diff --git a/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java b/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptIT.java
index 098cbb514a..056d185386 100644
--- a/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java
+++ b/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptIT.java
@@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.notNullValue;
 
-public class ExpressionScriptTests extends ElasticsearchIntegrationTest {
+public class ExpressionScriptIT extends ElasticsearchIntegrationTest {
 
     private SearchRequestBuilder buildRequest(String script, Object... params) {
         ensureGreen("test");
diff --git a/core/src/test/java/org/elasticsearch/search/CountSearchTests.java b/core/src/test/java/org/elasticsearch/search/CountSearchIT.java
index fd7f028a92..4ecbff7c1a 100644
--- a/core/src/test/java/org/elasticsearch/search/CountSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/CountSearchIT.java
@@ -30,7 +30,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear
 /**
  * {@link SearchType#COUNT} is deprecated but let's make sure it still works as expected.
  */
-public class CountSearchTests extends ElasticsearchIntegrationTest {
+public class CountSearchIT extends ElasticsearchIntegrationTest {
 
     public void testDuelCountQueryThenFetch() throws Exception {
         createIndex("idx");
diff --git a/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java b/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java
index 322679a584..4b5b787756 100644
--- a/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
 @LuceneTestCase.Slow
-public class SearchWithRejectionsTests extends ElasticsearchIntegrationTest {
+public class SearchWithRejectionsIT extends ElasticsearchIntegrationTest {
     @Override
     public Settings nodeSettings(int nodeOrdinal) {
         return settingsBuilder().put(super.nodeSettings(nodeOrdinal))
diff --git a/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperTest.java b/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java
index e83f477d33..748959319c 100644
--- a/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperTest.java
+++ b/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java
@@ -35,7 +35,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 
 @ClusterScope(scope = SUITE)
-public class StressSearchServiceReaperTest extends ElasticsearchIntegrationTest {
+public class StressSearchServiceReaperIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryIT.java
index 2e27c68304..8cd52c3f80 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryIT.java
@@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class AggregationsBinaryTests extends ElasticsearchIntegrationTest {
+public class AggregationsBinaryIT extends ElasticsearchIntegrationTest {
 
     private static final String STRING_FIELD_NAME = "s_value";
     private static final String INT_FIELD_NAME = "i_value";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java
index 640ac7ffb8..50302a731a 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java
@@ -36,7 +36,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear
 
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class AggregationsIntegrationTests extends ElasticsearchIntegrationTest {
+public class AggregationsIntegrationIT extends ElasticsearchIntegrationTest {
 
     static int numDocs;
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/CombiTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java
index 4888996f35..a2b24b3d1a 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/CombiTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java
@@ -46,7 +46,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
 /**
  *
  */
-public class CombiTests extends ElasticsearchIntegrationTest {
+public class CombiIT extends ElasticsearchIntegrationTest {
 
     /**
      * Making sure that if there are multiple aggregations, working on the same field, yet require different
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java
index 109d0951a5..02f81c18ce 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java
@@ -72,7 +72,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  * the growth of dynamic arrays is tested.
  */
 @Slow
-public class EquivalenceTests extends ElasticsearchIntegrationTest {
+public class EquivalenceIT extends ElasticsearchIntegrationTest {
 
     // Make sure that unordered, reversed, disjoint and/or overlapping ranges are supported
     // Duel with filters
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java
index 10e399df6a..a18893f80d 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java
@@ -38,7 +38,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 /**
  *
  */
-public class MetaDataTests extends ElasticsearchIntegrationTest {
+public class MetaDataIT extends ElasticsearchIntegrationTest {
 
     /**
      * Making sure that if there are multiple aggregations, working on the same field, yet require different
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java
index 157dc528f8..e14f2ee7b7 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java
@@ -41,7 +41,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class MissingValueTests extends ElasticsearchIntegrationTest {
+public class MissingValueIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int maximumNumberOfShards() {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/ParsingTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/ParsingIT.java
index 9007611aa9..4c5232c232 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/ParsingTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/ParsingIT.java
@@ -29,7 +29,7 @@ import java.security.SecureRandom;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class ParsingTests extends ElasticsearchIntegrationTest {
+public class ParsingIT extends ElasticsearchIntegrationTest {
 
     @Test(expected=SearchPhaseExecutionException.class)
     public void testTwoTypes() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java
index 20378c96e2..c96f65f7e8 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java
@@ -35,7 +35,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class BooleanTermsTests extends ElasticsearchIntegrationTest {
+public class BooleanTermsIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "b_value";
     private static final String MULTI_VALUED_FIELD_NAME = "b_values";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenIT.java
index 6379ba4709..4cfe02eab0 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenIT.java
@@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.*;
 /**
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class ChildrenTests extends ElasticsearchIntegrationTest {
+public class ChildrenIT extends ElasticsearchIntegrationTest {
 
     private final static Map<String, Control> categoryToControl = new HashMap<>();
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java
index 496b5eb640..36a29f49fb 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java
@@ -64,7 +64,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class DateHistogramTests extends ElasticsearchIntegrationTest {
+public class DateHistogramIT extends ElasticsearchIntegrationTest {
 
     private DateTime date(int month, int day) {
         return new DateTime(2012, month, day, 0, 0, DateTimeZone.UTC);
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java
index b4ec3e3342..284c130797 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java
@@ -50,7 +50,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
 @ElasticsearchIntegrationTest.ClusterScope(scope=ElasticsearchIntegrationTest.Scope.SUITE)
-public class DateHistogramOffsetTests extends ElasticsearchIntegrationTest {
+public class DateHistogramOffsetIT extends ElasticsearchIntegrationTest {
 
     private static final String DATE_FORMAT = "yyyy-MM-dd:hh-mm-ss";
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java
index 795c582943..0b82296710 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java
@@ -56,7 +56,7 @@ import static org.hamcrest.core.IsNull.nullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class DateRangeTests extends ElasticsearchIntegrationTest {
+public class DateRangeIT extends ElasticsearchIntegrationTest {
 
     private static IndexRequestBuilder indexDoc(int month, int day, int value) throws Exception {
         return client().prepareIndex("idx", "type").setSource(jsonBuilder()
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationIT.java
index aeba973a7d..3e073c53bc 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationIT.java
@@ -32,7 +32,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 
-public class DedicatedAggregationTests extends ElasticsearchIntegrationTest {
+public class DedicatedAggregationIT extends ElasticsearchIntegrationTest {
 
     // https://github.com/elasticsearch/elasticsearch/issues/7240
     @Test
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java
index 032504b1a0..b254472724 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java
@@ -49,7 +49,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class FilterTests extends ElasticsearchIntegrationTest {
+public class FilterIT extends ElasticsearchIntegrationTest {
 
     static int numDocs, numTag1Docs;
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java
index e8cbce4bbb..b0640c2529 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java
@@ -52,7 +52,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class FiltersTests extends ElasticsearchIntegrationTest {
+public class FiltersIT extends ElasticsearchIntegrationTest {
 
     static int numDocs, numTag1Docs, numTag2Docs, numOtherDocs;
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java
index 028b053c64..254b6e16fc 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java
@@ -54,7 +54,7 @@ import static org.hamcrest.core.IsNull.nullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class GeoDistanceTests extends ElasticsearchIntegrationTest {
+public class GeoDistanceIT extends ElasticsearchIntegrationTest {
 
     private IndexRequestBuilder indexCity(String idx, String name, String... latLons) throws Exception {
         XContentBuilder source = jsonBuilder().startObject().field("city", name);
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java
index dac686ea4a..1c35a776ef 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java
@@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class GeoHashGridTests extends ElasticsearchIntegrationTest {
+public class GeoHashGridIT extends ElasticsearchIntegrationTest {
 
     static ObjectIntMap<String> expectedDocCountsForGeoHash = null;
     static ObjectIntMap<String> multiValuedExpectedDocCountsForGeoHash = null;
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java
index a3b5a985e3..e03b7925be 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java
@@ -43,7 +43,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class GlobalTests extends ElasticsearchIntegrationTest {
+public class GlobalIT extends ElasticsearchIntegrationTest {
 
     static int numDocs;
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java
index 2b8b57a3fe..ee698b25c2 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java
@@ -61,7 +61,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class HistogramTests extends ElasticsearchIntegrationTest {
+public class HistogramIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "l_value";
     private static final String MULTI_VALUED_FIELD_NAME = "l_values";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeIT.java
index fd7db94b3b..78b4192f6e 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeIT.java
@@ -51,7 +51,7 @@ import static org.hamcrest.core.IsNull.nullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class IPv4RangeTests extends ElasticsearchIntegrationTest {
+public class IPv4RangeIT extends ElasticsearchIntegrationTest {
 
     @Override
     public void setupSuiteScopeCluster() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java
index b263187920..04c0653aa3 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java
@@ -44,7 +44,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class MissingTests extends ElasticsearchIntegrationTest {
+public class MissingIT extends ElasticsearchIntegrationTest {
 
     static int numDocs, numDocsMissing, numDocsUnmapped;
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java
index a8acf62ac7..0764e94d4e 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java
@@ -41,7 +41,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class NaNSortingTests extends ElasticsearchIntegrationTest {
+public class NaNSortingIT extends ElasticsearchIntegrationTest {
 
     private enum SubAggregation {
         AVG("avg") {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java
index 9b4a5bb78b..7484c6a894 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java
@@ -67,7 +67,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class NestedTests extends ElasticsearchIntegrationTest {
+public class NestedIT extends ElasticsearchIntegrationTest {
 
     static int numParents;
     static int[] numChildren;
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java
index b3ae0733dd..116bec9a55 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java
@@ -34,7 +34,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 
-public class ParentIdAggTests extends ElasticsearchIntegrationTest {
+public class ParentIdAggIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testParentIdAggregation() throws IOException {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java
index 4ea14e5bf9..391c22a9cf 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java
@@ -52,7 +52,7 @@ import static org.hamcrest.core.IsNull.nullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class RangeTests extends ElasticsearchIntegrationTest {
+public class RangeIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "l_value";
     private static final String MULTI_VALUED_FIELD_NAME = "l_values";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java
index 01321634cd..4e1a8b7c95 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java
@@ -59,7 +59,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class ReverseNestedTests extends ElasticsearchIntegrationTest {
+public class ReverseNestedIT extends ElasticsearchIntegrationTest {
 
     @Override
     public void setupSuiteScopeCluster() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java
index d6ff926e4f..9891290431 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java
@@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo;
  * Tests the Sampler aggregation
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class SamplerTests extends ElasticsearchIntegrationTest {
+public class SamplerIT extends ElasticsearchIntegrationTest {
 
     public static final int NUM_SHARDS = 2;
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java
index 232f85f3cf..108c57cc26 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java
@@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.equalTo;
  * we can make sure that the reduce is properly propagated by checking that empty buckets were created.
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class ShardReduceTests extends ElasticsearchIntegrationTest {
+public class ShardReduceIT extends ElasticsearchIntegrationTest {
 
     private IndexRequestBuilder indexDoc(String date, int value) throws Exception {
         return client().prepareIndex("idx", "type").setSource(jsonBuilder()
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsIT.java
index 8e5431d653..147699e89b 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsIT.java
@@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.is;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class SignificantTermsTests extends ElasticsearchIntegrationTest {
+public class SignificantTermsIT extends ElasticsearchIntegrationTest {
 
     public String randomExecutionHint() {
         return randomBoolean() ? null : randomFrom(ExecutionMode.values()).toString();
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java
index 05fc2030aa..e6b053d40f 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java
@@ -66,7 +66,7 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
-public class SignificantTermsSignificanceScoreTests extends ElasticsearchIntegrationTest {
+public class SignificantTermsSignificanceScoreIT extends ElasticsearchIntegrationTest {
 
     static final String INDEX_NAME = "testidx";
     static final String DOC_TYPE = "doc";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java
index 144cb4d4f9..f5c561a67e 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java
@@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class TermsDocCountErrorTests extends ElasticsearchIntegrationTest {
+public class TermsDocCountErrorIT extends ElasticsearchIntegrationTest {
 
     private static final String STRING_FIELD_NAME = "s_value";
     private static final String LONG_FIELD_NAME = "l_value";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java
index 4a7a49d2e9..040819c877 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java
@@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  *
  */
-public class TermsShardMinDocCountTests extends ElasticsearchIntegrationTest {
+public class TermsShardMinDocCountIT extends ElasticsearchIntegrationTest {
     private static final String index = "someindex";
     private static final String type = "testtype";
     public String randomExecutionHint() {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsIT.java
index f3ddb1ff28..2f8b355ecf 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsIT.java
@@ -79,7 +79,7 @@ import static org.hamcrest.Matchers.sameInstance;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest()
-public class TopHitsTests extends ElasticsearchIntegrationTest {
+public class TopHitsIT extends ElasticsearchIntegrationTest {
 
     private static final String TERMS_AGGS_FIELD = "terms";
     private static final String SORT_FIELD = "sort";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java
index bf708ec5c5..2fe87192df 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java
@@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class CardinalityTests extends ElasticsearchIntegrationTest {
+public class CardinalityIT extends ElasticsearchIntegrationTest {
 
     @Override
     public Settings indexSettings() {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java
index 386ae1416e..93d9a27ba3 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java
@@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.sameInstance;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class GeoBoundsTests extends ElasticsearchIntegrationTest {
+public class GeoBoundsIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "geo_value";
     private static final String MULTI_VALUED_FIELD_NAME = "geo_values";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java
index 4400f96273..8944a215f9 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java
@@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.sameInstance;
 
 @ClusterScope(scope = Scope.SUITE)
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
+public class ScriptedMetricIT extends ElasticsearchIntegrationTest {
 
     private static long numDocs;
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java
index 0840bd6070..70ea3ea98a 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java
@@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.notNullValue;
  *
  */
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class ValueCountTests extends ElasticsearchIntegrationTest {
+public class ValueCountIT extends ElasticsearchIntegrationTest {
 
     @Override
     public void setupSuiteScopeCluster() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java
index abf8629ae2..909a36ee92 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java
@@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class AvgBucketTests extends ElasticsearchIntegrationTest {
+public class AvgBucketIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "l_value";
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java
index 8667e9c28f..05239efb75 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java
@@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class BucketScriptTests extends ElasticsearchIntegrationTest {
+public class BucketScriptIT extends ElasticsearchIntegrationTest {
 
     private static final String FIELD_1_NAME = "field1";
     private static final String FIELD_2_NAME = "field2";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java
index bd8db68959..70fc2879ee 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java
@@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.lessThan;
 import static org.hamcrest.Matchers.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class BucketSelectorTests extends ElasticsearchIntegrationTest {
+public class BucketSelectorIT extends ElasticsearchIntegrationTest {
 
     private static final String FIELD_1_NAME = "field1";
     private static final String FIELD_2_NAME = "field2";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java
index 2af323722f..e49172c68c 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java
@@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class CumulativeSumTests extends ElasticsearchIntegrationTest {
+public class CumulativeSumIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "l_value";
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java
index 1bba222387..dadc7a7ffd 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java
@@ -54,7 +54,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
 import static org.hamcrest.core.IsNull.nullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class DateDerivativeTests extends ElasticsearchIntegrationTest {
+public class DateDerivativeIT extends ElasticsearchIntegrationTest {
 
     private DateTime date(int month, int day) {
         return new DateTime(2012, month, day, 0, 0, DateTimeZone.UTC);
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java
index d587b17e30..7134dc4ea1 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java
@@ -57,7 +57,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
 import static org.hamcrest.core.IsNull.nullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class DerivativeTests extends ElasticsearchIntegrationTest {
+public class DerivativeIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "l_value";
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java
index 3f12b81325..6d52cab4b0 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java
@@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class MaxBucketTests extends ElasticsearchIntegrationTest {
+public class MaxBucketIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "l_value";
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java
index e08138fce4..f8ba15e7ee 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java
@@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class MinBucketTests extends ElasticsearchIntegrationTest {
+public class MinBucketIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "l_value";
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java
index 550625be32..f5f0f96124 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java
@@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.core.IsNull.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class SumBucketTests extends ElasticsearchIntegrationTest {
+public class SumBucketIT extends ElasticsearchIntegrationTest {
 
     private static final String SINGLE_VALUED_FIELD_NAME = "l_value";
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java
index aa72c06b0f..795eccc384 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java
@@ -55,7 +55,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
 import static org.hamcrest.core.IsNull.nullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class MovAvgTests extends ElasticsearchIntegrationTest {
+public class MovAvgIT extends ElasticsearchIntegrationTest {
 
     private static final String INTERVAL_FIELD = "l_value";
     private static final String VALUE_FIELD = "v_value";
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java
index 70aa5669dd..c5e7cd5c63 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java
@@ -45,7 +45,7 @@ import static org.hamcrest.core.IsNull.notNullValue;
 import static org.hamcrest.core.IsNull.nullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class SerialDiffTests extends ElasticsearchIntegrationTest {
+public class SerialDiffIT extends ElasticsearchIntegrationTest {
     private static final String INTERVAL_FIELD = "l_value";
     private static final String VALUE_FIELD = "v_value";
 
diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java
index 46d1e0440c..a4438f1179 100644
--- a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java
+++ b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java
@@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
  * This test basically verifies that search with a single shard active (cause we indexed to it) and other
  * shards possibly not active at all (cause they haven't allocated) will still work.
  */
-public class SearchWhileCreatingIndexTests extends ElasticsearchIntegrationTest {
+public class SearchWhileCreatingIndexIT extends ElasticsearchIntegrationTest {
 
     @Test
     @Slow
diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java
index 23b1702a51..de530cd61f 100644
--- a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java
+++ b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java
@@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
 @ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2)
-public class SearchWhileRelocatingTests extends ElasticsearchIntegrationTest {
+public class SearchWhileRelocatingIT extends ElasticsearchIntegrationTest {
 
     @Test
     @Nightly
diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java
index e720f449f8..8810d67b38 100644
--- a/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java
@@ -51,7 +51,7 @@ import java.util.concurrent.ExecutionException;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 
-public class SearchWithRandomExceptionsTests extends ElasticsearchIntegrationTest {
+public class SearchWithRandomExceptionsIT extends ElasticsearchIntegrationTest {
 
     @Test
     @Slow // maybe due to all the logging?
diff --git a/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java b/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java
index f75301f8ba..aaff1c9ae4 100644
--- a/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java
+++ b/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java
@@ -42,7 +42,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.*;
 
-public class TransportSearchFailuresTests extends ElasticsearchIntegrationTest {
+public class TransportSearchFailuresIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int maximumNumberOfReplicas() {
diff --git a/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java b/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java
index dd2f43f522..9fad1e6e11 100644
--- a/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java
@@ -63,7 +63,7 @@ import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.hamcrest.Matchers.*;
 
-public class TransportTwoNodesSearchTests extends ElasticsearchIntegrationTest {
+public class TransportTwoNodesSearchIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfReplicas() {
diff --git a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcIT.java
index 02af90d084..cc6179e144 100644
--- a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
+++ b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcIT.java
@@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.startsWith;
  *
  */
 @ClusterScope(scope = Scope.SUITE)
-public class ChildQuerySearchBwcTests extends ChildQuerySearchTests {
+public class ChildQuerySearchBwcIT extends ChildQuerySearchIT {
 
     @Override
     public Settings indexSettings() {
diff --git a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java
index c37565f845..04a0dab535 100644
--- a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java
@@ -68,7 +68,7 @@ import static org.hamcrest.Matchers.*;
  *
  */
 @ClusterScope(scope = Scope.SUITE)
-public class ChildQuerySearchTests extends ElasticsearchIntegrationTest {
+public class ChildQuerySearchIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcIT.java
index f1617e40c5..c7a55ff884 100644
--- a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java
+++ b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcIT.java
@@ -46,12 +46,12 @@ import java.io.IOException;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static org.elasticsearch.search.child.ChildQuerySearchTests.hasChildQuery;
+import static org.elasticsearch.search.child.ChildQuerySearchIT.hasChildQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 
-public class ParentFieldLoadingBwcTest extends ElasticsearchIntegrationTest {
+public class ParentFieldLoadingBwcIT extends ElasticsearchIntegrationTest {
 
     private final Settings indexSettings = Settings.builder()
             .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
diff --git a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java
index 7971f76f11..4a79d0ca5b 100644
--- a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
+++ b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java
@@ -43,7 +43,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 
-public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
+public class ParentFieldLoadingIT extends ElasticsearchIntegrationTest {
 
     private final Settings indexSettings = Settings.builder()
             .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
diff --git a/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginTests.java b/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java
index a4263b20f9..a9cb67fb73 100644
--- a/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginTests.java
+++ b/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java
@@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.equalTo;
  *
  */
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1)
-public class FetchSubPhasePluginTests extends ElasticsearchIntegrationTest {
+public class FetchSubPhasePluginIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java b/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java
index 9955e67db2..346d5e39f7 100644
--- a/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java
@@ -68,7 +68,7 @@ import static org.hamcrest.Matchers.*;
 /**
  *
  */
-public class SearchFieldsTests extends ElasticsearchIntegrationTest {
+public class SearchFieldsIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testStoredFields() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java
index 4d4c9c71f0..9d0f54b91f 100644
--- a/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java
+++ b/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java
@@ -53,7 +53,7 @@ import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
-public class DecayFunctionScoreTests extends ElasticsearchIntegrationTest {
+public class DecayFunctionScoreIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testDistanceScoreGeoLinGaussExp() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java
index 3f10ce389a..efed64f2cd 100644
--- a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java
+++ b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java
@@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1)
-public class ExplainableScriptTests extends ElasticsearchIntegrationTest {
+public class ExplainableScriptIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptPlugin.java b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptPlugin.java
index 806f1642b4..d30c9453ec 100644
--- a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptPlugin.java
+++ b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptPlugin.java
@@ -36,6 +36,6 @@ public class ExplainableScriptPlugin extends AbstractPlugin {
     }
 
     public void onModule(ScriptModule module) {
-        module.registerScript("native_explainable_script", ExplainableScriptTests.MyNativeScriptFactory.class);
+        module.registerScript("native_explainable_script", ExplainableScriptIT.MyNativeScriptFactory.class);
     }
 }
diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java
index 2a780fd9fe..2f583cb3df 100644
--- a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueTests.java
+++ b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java
@@ -35,7 +35,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 /**
  * Tests for the {@code field_value_factor} function in a function_score query.
  */
-public class FunctionScoreFieldValueTests extends ElasticsearchIntegrationTest {
+public class FunctionScoreFieldValueIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testFieldValueFactor() throws IOException {
diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java
index a4f5449bf2..fbf5d04c56 100644
--- a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java
+++ b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java
@@ -62,7 +62,7 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
 
 @Slow
-public class FunctionScoreTests extends ElasticsearchIntegrationTest {
+public class FunctionScoreIT extends ElasticsearchIntegrationTest {
 
     static final String TYPE = "type";
     static final String INDEX = "index";
@@ -133,7 +133,7 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
                     .field(DOUBLE_FIELD, Math.E)
                     .endObject();
         } catch (IOException e) {
-            throw new ElasticsearchException("Exception while initializing FunctionScoreTests", e);
+            throw new ElasticsearchException("Exception while initializing FunctionScoreIT", e);
         }
         SIMPLE_DOC = simpleDoc;
         try {
@@ -154,7 +154,7 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
                     .endObject()
                     .endObject();
         } catch (IOException e) {
-            throw new ElasticsearchException("Exception while initializing FunctionScoreTests", e);
+            throw new ElasticsearchException("Exception while initializing FunctionScoreIT", e);
         }
         MAPPING_WITH_DOUBLE_AND_GEO_POINT_AND_TEXT_FIELD = mappingWithDoubleAndGeoPointAndTestField;
     }
diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java
index 05551cf493..d3cd012e8c 100644
--- a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java
+++ b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java
@@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.equalTo;
  *
  */
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1)
-public class FunctionScorePluginTests extends ElasticsearchIntegrationTest {
+public class FunctionScorePluginIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
@@ -108,7 +108,7 @@ public class FunctionScorePluginTests extends ElasticsearchIntegrationTest {
         }
 
         public void onModule(FunctionScoreModule scoreModule) {
-            scoreModule.registerParser(FunctionScorePluginTests.CustomDistanceScoreParser.class);
+            scoreModule.registerParser(FunctionScorePluginIT.CustomDistanceScoreParser.class);
         }
 
     }
diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java
index 0008c94e76..b3f10ea912 100644
--- a/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java
+++ b/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java
@@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.nullValue;
 
-public class RandomScoreFunctionTests extends ElasticsearchIntegrationTest {
+public class RandomScoreFunctionIT extends ElasticsearchIntegrationTest {
 
     @Slow
     public void testConsistentHitsWithSameSeed() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java
index b83cc33693..c46a238d9b 100644
--- a/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java
+++ b/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java
@@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  *
  */
-public class GeoBoundingBoxTests extends ElasticsearchIntegrationTest {
+public class GeoBoundingBoxIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void simpleBoundingBoxTest() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java
index 79ae781997..c06754d14d 100644
--- a/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java
+++ b/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java
@@ -62,7 +62,7 @@ import static org.hamcrest.Matchers.equalTo;
 
 /**
  */
-public class GeoDistanceTests extends ElasticsearchIntegrationTest {
+public class GeoDistanceIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void simpleDistanceTests() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java
index 5895b94fc0..d4a81d0a7e 100644
--- a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java
+++ b/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java
@@ -67,7 +67,7 @@ import static org.hamcrest.Matchers.*;
 /**
  *
  */
-public class GeoFilterTests extends ElasticsearchIntegrationTest {
+public class GeoFilterIT extends ElasticsearchIntegrationTest {
 
     private static boolean intersectSupport;
     private static boolean disjointSupport;
diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java
index 014143a2be..c878baf2e6 100644
--- a/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonTests.java
+++ b/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java
@@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.equalTo;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class GeoPolygonTests extends ElasticsearchIntegrationTest {
+public class GeoPolygonIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected void setupSuiteScopeCluster() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java b/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java
index 4ddf393b4a..64b11866d1 100644
--- a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java
@@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.nullValue;
 
-public class GeoShapeIntegrationTests extends ElasticsearchIntegrationTest {
+public class GeoShapeIntegrationIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testNullShape() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java b/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchIT.java
index 8aaff21dc8..ad7aed2f5b 100644
--- a/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchIT.java
@@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo;
  *
  */
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1)
-public class CustomHighlighterSearchTests extends ElasticsearchIntegrationTest {
+public class CustomHighlighterSearchIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java
index c9312a5db9..72843eabff 100644
--- a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java
@@ -56,7 +56,7 @@ import static org.elasticsearch.test.hamcrest.RegexMatcher.matches;
 import static org.hamcrest.Matchers.*;
 
 @Slow
-public class HighlighterSearchTests extends ElasticsearchIntegrationTest {
+public class HighlighterSearchIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testHighlightingWithWildcardName() throws IOException {
diff --git a/core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java b/core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchIT.java
index 9b121c7947..ae3f7b43a0 100644
--- a/core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchIT.java
@@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  *
  */
-public class SimpleIndicesBoostSearchTests extends ElasticsearchIntegrationTest {
+public class SimpleIndicesBoostSearchIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testIndicesBoost() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java b/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java
index 7c34b34348..1c867bda10 100644
--- a/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java
@@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.*;
 
 /**
  */
-public class InnerHitsTests extends ElasticsearchIntegrationTest {
+public class InnerHitsIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimpleNested() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java b/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java
index 6b0a7a74ee..158eafb27e 100644
--- a/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java
+++ b/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java
@@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.hasItemInArray;
 /**
  *
  */
-public class MatchedQueriesTests extends ElasticsearchIntegrationTest {
+public class MatchedQueriesIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void simpleMatchedQueryFromFilteredQuery() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisTests.java b/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java
index 85c52a36d3..2efc1b721a 100644
--- a/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisTests.java
+++ b/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java
@@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.notNullValue;
 /**
  *
  */
-public class MoreLikeThisTests extends ElasticsearchIntegrationTest {
+public class MoreLikeThisIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimpleMoreLikeThis() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java b/core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchIT.java
index dc3b1dfe66..3517fdf05b 100644
--- a/core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchIT.java
@@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.equalTo;
 
 /**
  */
-public class SimpleMultiSearchTests extends ElasticsearchIntegrationTest {
+public class SimpleMultiSearchIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void simpleMultiSearch() {
diff --git a/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java b/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java
index 452e421ab8..705ceeecaf 100644
--- a/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java
+++ b/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java
@@ -35,7 +35,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.hamcrest.Matchers.*;
 
 @ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2)
-public class SearchPreferenceTests extends ElasticsearchIntegrationTest {
+public class SearchPreferenceIT extends ElasticsearchIntegrationTest {
 
     @Test // see #2896
     public void testStopOneNodePreferenceWithRedState() throws InterruptedException, IOException {
diff --git a/core/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java b/core/src/test/java/org/elasticsearch/search/query/ExistsMissingIT.java
index 3a2c2fcefc..595240cf00 100644
--- a/core/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java
+++ b/core/src/test/java/org/elasticsearch/search/query/ExistsMissingIT.java
@@ -43,7 +43,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
 
-public class ExistsMissingTests extends ElasticsearchIntegrationTest {
+public class ExistsMissingIT extends ElasticsearchIntegrationTest {
 
     // TODO: move this to a unit test somewhere...
     public void testEmptyIndex() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java b/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java
index d0131cffde..42fea05c64 100644
--- a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryTests.java
+++ b/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java
@@ -51,7 +51,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
-public class MultiMatchQueryTests extends ElasticsearchIntegrationTest {
+public class MultiMatchQueryIT extends ElasticsearchIntegrationTest {
 
     @Before
     public void init() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java
index c539db49a3..1872b823fd 100644
--- a/core/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
+++ b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java
@@ -63,7 +63,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
 @Slow
-public class SearchQueryTests extends ElasticsearchIntegrationTest {
+public class SearchQueryIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int maximumNumberOfShards() {
diff --git a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java b/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java
index eaa016411a..a267339064 100644
--- a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringTests.java
+++ b/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java
@@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  * Tests for the {@code simple_query_string} query
  */
-public class SimpleQueryStringTests extends ElasticsearchIntegrationTest {
+public class SimpleQueryStringIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimpleQueryString() throws ExecutionException, InterruptedException {
diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerIT.java
index 3ed24ac816..2cfd817f5f 100644
--- a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
+++ b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerIT.java
@@ -65,7 +65,7 @@ import static org.hamcrest.Matchers.notNullValue;
 /**
  *
  */
-public class QueryRescorerTests extends ElasticsearchIntegrationTest {
+public class QueryRescorerIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testEnforceWindowSize() {
diff --git a/core/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java b/core/src/test/java/org/elasticsearch/search/scan/SearchScanIT.java
index 31fd0ae1e9..64f3e783a9 100644
--- a/core/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java
+++ b/core/src/test/java/org/elasticsearch/search/scan/SearchScanIT.java
@@ -35,7 +35,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 import static org.hamcrest.Matchers.equalTo;
 
-public class SearchScanTests extends ElasticsearchIntegrationTest {
+public class SearchScanIT extends ElasticsearchIntegrationTest {
 
     @Test
     @Slow 
diff --git a/core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java b/core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingIT.java
index 5a11bd3a04..e5eefb83f7 100644
--- a/core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java
+++ b/core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingIT.java
@@ -34,7 +34,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 
-public class SearchScanScrollingTests extends ElasticsearchIntegrationTest {
+public class SearchScanScrollingIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testRandomized() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java b/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java
index 17a9c0f491..04e2bb5a38 100644
--- a/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java
@@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.equalTo;
  *
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope=ElasticsearchIntegrationTest.Scope.SUITE)
-public class ScriptQuerySearchTests extends ElasticsearchIntegrationTest {
+public class ScriptQuerySearchIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollTests.java b/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java
index 0dc085dd0a..e2562f3943 100644
--- a/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollTests.java
+++ b/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java
@@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo;
 
 /**
  */
-public class DuelScrollTests extends ElasticsearchIntegrationTest {
+public class DuelScrollIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testDuel_queryThenFetch() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java
index fdff350910..3b592df6b7 100644
--- a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java
+++ b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java
@@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*;
 /**
  *
  */
-public class SearchScrollTests extends ElasticsearchIntegrationTest {
+public class SearchScrollIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimpleScrollQueryThenFetch() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesTests.java b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java
index 836d76b5a9..9247714e85 100644
--- a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesTests.java
+++ b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java
@@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*;
 /**
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, numClientNodes = 0)
-public class SearchScrollWithFailingNodesTests extends ElasticsearchIntegrationTest {
+public class SearchScrollWithFailingNodesIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfShards() {
diff --git a/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java b/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java
index 57964e950b..f9c2f8a280 100644
--- a/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java
@@ -41,7 +41,7 @@ import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.containsString;
 
-public class SimpleSearchTests extends ElasticsearchIntegrationTest {
+public class SimpleSearchIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSearchNullIndex() {
diff --git a/core/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java b/core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java
index d6a9cc8dd5..8321b3b64c 100644
--- a/core/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java
+++ b/core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java
@@ -92,7 +92,7 @@ import static org.hamcrest.Matchers.nullValue;
 /**
  *
  */
-public class SimpleSortTests extends ElasticsearchIntegrationTest {
+public class SimpleSortIT extends ElasticsearchIntegrationTest {
 
     @TestLogging("action.search.type:TRACE")
     @LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elasticsearch/elasticsearch/issues/9421")
diff --git a/core/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java b/core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java
index ce8b3a534b..73d5235e1e 100644
--- a/core/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java
+++ b/core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java
@@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsEqual.equalTo;
 
-public class SourceFetchingTests extends ElasticsearchIntegrationTest {
+public class SourceFetchingIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSourceDefaultBehavior() {
diff --git a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java b/core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java
index 1d8c2e4419..79fc32b492 100644
--- a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java
@@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.nullValue;
 /**
  */
 @ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2)
-public class SearchStatsTests extends ElasticsearchIntegrationTest {
+public class SearchStatsIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected int numberOfReplicas() {
diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java
index a87c66aa67..1b30598a3b 100644
--- a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java
@@ -67,7 +67,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllS
 import static org.hamcrest.Matchers.*;
 
 @SuppressCodecs("*") // requires custom completion format
-public class CompletionSuggestSearchTests extends ElasticsearchIntegrationTest {
+public class CompletionSuggestSearchIT extends ElasticsearchIntegrationTest {
 
     private final String INDEX = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT);
     private final String TYPE = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT);
diff --git a/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java b/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java
index 95bbcbba03..a56187eef9 100644
--- a/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java
@@ -51,7 +51,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions.assertD
 import static org.hamcrest.Matchers.containsString;
 
 @SuppressCodecs("*") // requires custom completion format
-public class ContextSuggestSearchTests extends ElasticsearchIntegrationTest {
+public class ContextSuggestSearchIT extends ElasticsearchIntegrationTest {
 
     private static final String INDEX = "test";
     private static final String TYPE = "testType";
diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java b/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java
index c6f48e7600..7bafe64007 100644
--- a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java
@@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.is;
  *
  */
 @ClusterScope(scope= Scope.SUITE, numDataNodes =1)
-public class CustomSuggesterSearchTests extends ElasticsearchIntegrationTest {
+public class CustomSuggesterSearchIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java b/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java
index b5c114ab38..e16df6388e 100644
--- a/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
+++ b/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java
@@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.*;
  * possible these tests should declare for the first request, make the request, modify the configuration for the next request, make that
  * request, modify again, request again, etc.  This makes it very obvious what changes between requests.
  */
-public class SuggestSearchTests extends ElasticsearchIntegrationTest {
+public class SuggestSearchIT extends ElasticsearchIntegrationTest {
 
     @Test // see #3196
     public void testSuggestAcrossMultipleIndices() throws IOException {
@@ -508,7 +508,7 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
         assertAcked(builder.addMapping("type1", mapping));
         ensureGreen();
 
-        for (String line: Resources.readLines(SuggestSearchTests.class.getResource("/config/names.txt"), Charsets.UTF_8)) {
+        for (String line: Resources.readLines(SuggestSearchIT.class.getResource("/config/names.txt"), Charsets.UTF_8)) {
             index("test", "type1", line, "body", line, "body_reverse", line, "bigram", line);
         }
         refresh();
@@ -700,7 +700,7 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
         assertAcked(builder.addMapping("type1", mapping));
         ensureGreen();
 
-        for (String line: Resources.readLines(SuggestSearchTests.class.getResource("/config/names.txt"), Charsets.UTF_8)) {
+        for (String line: Resources.readLines(SuggestSearchIT.class.getResource("/config/names.txt"), Charsets.UTF_8)) {
             index("test", "type1", line, "body", line, "bigram", line, "ngram", line);
         }
         refresh();
diff --git a/core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java b/core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutIT.java
index 3025752f46..7a37ded1ab 100644
--- a/core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java
+++ b/core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutIT.java
@@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo;
 /**
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope=ElasticsearchIntegrationTest.Scope.SUITE)
-public class SearchTimeoutTests extends ElasticsearchIntegrationTest {
+public class SearchTimeoutIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/similarity/SimilarityTests.java b/core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java
index 8dd58e2307..8b1eee953f 100644
--- a/core/src/test/java/org/elasticsearch/similarity/SimilarityTests.java
+++ b/core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java
@@ -29,7 +29,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 
-public class SimilarityTests  extends ElasticsearchIntegrationTest {
+public class SimilarityIT  extends ElasticsearchIntegrationTest {
     
 
     @Test
diff --git a/core/src/test/java/org/elasticsearch/test/disruption/NetworkPartitionTests.java b/core/src/test/java/org/elasticsearch/test/disruption/NetworkPartitionIT.java
index a6e522aeaa..049c6f58bc 100644
--- a/core/src/test/java/org/elasticsearch/test/disruption/NetworkPartitionTests.java
+++ b/core/src/test/java/org/elasticsearch/test/disruption/NetworkPartitionIT.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import java.io.IOException;
 
 @LuceneTestCase.Slow
-public class NetworkPartitionTests extends ElasticsearchIntegrationTest {
+public class NetworkPartitionIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java b/core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java
index 58956aace5..f17542c112 100644
--- a/core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterTests.java
+++ b/core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java
@@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo;
  * the tests random sequence due to initializtion using the same random instance.
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
-public class SuiteScopeClusterTests extends ElasticsearchIntegrationTest {
+public class SuiteScopeClusterIT extends ElasticsearchIntegrationTest {
     private static int ITER = 0;
     private static long[] SEQUENCE = new long[100];
     private static Long CLUSTER_SEED = null;
diff --git a/core/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java b/core/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java
index 310be735bd..8130a2b4be 100644
--- a/core/src/test/java/org/elasticsearch/test/test/TestScopeClusterTests.java
+++ b/core/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java
@@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.equalTo;
  * the tests random sequence due to initializtion using the same random instance.
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)
-public class TestScopeClusterTests extends ElasticsearchIntegrationTest {
+public class TestScopeClusterIT extends ElasticsearchIntegrationTest {
     private static int ITER = 0;
     private static long[] SEQUENCE = new long[100];
     private static Long CLUSTER_SEED = null;
diff --git a/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java b/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java
index dc223deba0..1d51b26bd5 100644
--- a/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java
+++ b/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java
@@ -38,7 +38,7 @@ import org.elasticsearch.test.ElasticsearchSingleNodeTest;
 import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.hamcrest.RegexMatcher;
 import org.elasticsearch.threadpool.ThreadPool.Names;
-import org.elasticsearch.tribe.TribeTests;
+import org.elasticsearch.tribe.TribeIT;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.*;
 /**
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0)
-public class SimpleThreadPoolTests extends ElasticsearchIntegrationTest {
+public class SimpleThreadPoolIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
@@ -120,7 +120,7 @@ public class SimpleThreadPoolTests extends ElasticsearchIntegrationTest {
             String nodePrefix = "(" + Pattern.quote(InternalTestCluster.TRANSPORT_CLIENT_PREFIX) + ")?(" +
                     Pattern.quote(ElasticsearchIntegrationTest.SUITE_CLUSTER_NODE_PREFIX) + "|" +
                     Pattern.quote(ElasticsearchIntegrationTest.TEST_CLUSTER_NODE_PREFIX) + "|" +
-                    Pattern.quote(TribeTests.SECOND_CLUSTER_NODE_PREFIX) + ")";
+                    Pattern.quote(TribeIT.SECOND_CLUSTER_NODE_PREFIX) + ")";
             assertThat(threadName, RegexMatcher.matches("\\[" + nodePrefix + "\\d+\\]"));
         }
     }
diff --git a/core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java b/core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampIT.java
index 90365f68c1..ee7886174f 100644
--- a/core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java
+++ b/core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampIT.java
@@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.notNullValue;
 
 /**
  */
-public class SimpleTimestampTests  extends ElasticsearchIntegrationTest {
+public class SimpleTimestampIT  extends ElasticsearchIntegrationTest {
 
     @Test
     public void testSimpleTimestamp() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/transport/ActionNamesTests.java b/core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java
index 69be9f8fdf..89e3323219 100644
--- a/core/src/test/java/org/elasticsearch/transport/ActionNamesTests.java
+++ b/core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java
@@ -41,7 +41,7 @@ import static org.hamcrest.CoreMatchers.startsWith;
  * When an api exposes multiple transport handlers, some of which are invoked internally during the execution of the api,
  * we use the `[n]` suffix to identify node actions and the `[s]` suffix to identify shard actions.
  */
-public class ActionNamesTests extends ElasticsearchIntegrationTest {
+public class ActionNamesIT extends ElasticsearchIntegrationTest {
 
     @Test
     @SuppressWarnings("unchecked")
diff --git a/core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportTests.java b/core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportIT.java
index 40cb626ce9..3ed7cdf18b 100644
--- a/core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportTests.java
+++ b/core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportIT.java
@@ -68,7 +68,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
 
 @ClusterScope(scope = SUITE)
-public class ContextAndHeaderTransportTests extends ElasticsearchIntegrationTest {
+public class ContextAndHeaderTransportIT extends ElasticsearchIntegrationTest {
 
     private static final List<ActionRequest> requests =  new CopyOnWriteArrayList<>();
     private String randomHeaderKey = randomAsciiOfLength(10);
diff --git a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportTests.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportIT.java
index 403f2a7a2e..227f84a349 100644
--- a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportTests.java
+++ b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportIT.java
@@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.is;
  *
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 1)
-public class NettyTransportTests extends ElasticsearchIntegrationTest {
+public class NettyTransportIT extends ElasticsearchIntegrationTest {
 
     // static so we can use it in anonymous classes
     private static String channelProfileName = null;
diff --git a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationTests.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationIT.java
index 637a65f1df..ae6640a32d 100644
--- a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationTests.java
+++ b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationIT.java
@@ -38,7 +38,7 @@ import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import static org.hamcrest.Matchers.*;
 
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1, numClientNodes = 0)
-public class NettyTransportMultiPortIntegrationTests extends ElasticsearchIntegrationTest {
+public class NettyTransportMultiPortIntegrationIT extends ElasticsearchIntegrationTest {
 
     private static int randomPort = -1;
     private static String randomPortRange;
diff --git a/core/src/test/java/org/elasticsearch/tribe/TribeTests.java b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
index 7a0a8f769b..a1aba98321 100644
--- a/core/src/test/java/org/elasticsearch/tribe/TribeTests.java
+++ b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
@@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.notNullValue;
  */
 @Slow
 @LuceneTestCase.SuppressFileSystems("ExtrasFS") // doesn't work with potential multi data path from test cluster yet
-public class TribeTests extends ElasticsearchIntegrationTest {
+public class TribeIT extends ElasticsearchIntegrationTest {
 
     public static final String SECOND_CLUSTER_NODE_PREFIX = "node_tribe2";
 
diff --git a/core/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java b/core/src/test/java/org/elasticsearch/ttl/SimpleTTLIT.java
index e945769275..9240e0c0e7 100644
--- a/core/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java
+++ b/core/src/test/java/org/elasticsearch/ttl/SimpleTTLIT.java
@@ -44,7 +44,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.hamcrest.Matchers.*;
 
 @ClusterScope(scope= Scope.SUITE, numDataNodes = 1)
-public class SimpleTTLTests extends ElasticsearchIntegrationTest {
+public class SimpleTTLIT extends ElasticsearchIntegrationTest {
 
     static private final long PURGE_INTERVAL = 200;
 
diff --git a/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java b/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java
index 30ad56b2dd..27a9ab6c71 100644
--- a/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java
+++ b/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java
@@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.is;
  *
  */
 @ClusterScope(scope= Scope.SUITE, numDataNodes =1)
-public class UpdateByNativeScriptTests extends ElasticsearchIntegrationTest {
+public class UpdateByNativeScriptIT extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
diff --git a/core/src/test/java/org/elasticsearch/update/UpdateTests.java b/core/src/test/java/org/elasticsearch/update/UpdateIT.java
index d38f28b208..12498a8116 100644
--- a/core/src/test/java/org/elasticsearch/update/UpdateTests.java
+++ b/core/src/test/java/org/elasticsearch/update/UpdateIT.java
@@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
-public class UpdateTests extends ElasticsearchIntegrationTest {
+public class UpdateIT extends ElasticsearchIntegrationTest {
 
     private void createTestIndex() throws Exception {
         logger.info("--> creating index test");
diff --git a/core/src/test/java/org/elasticsearch/update/UpdateNoopTests.java b/core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java
index 9f4f203b29..bf9031203e 100644
--- a/core/src/test/java/org/elasticsearch/update/UpdateNoopTests.java
+++ b/core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java
@@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.notNullValue;
 /**
  * Tests for noop updates.
  */
-public class UpdateNoopTests extends ElasticsearchIntegrationTest {
+public class UpdateNoopIT extends ElasticsearchIntegrationTest {
     @Test
     public void singleField() throws Exception {
         updateAndCheckSource(1, fields("bar", "baz"));
diff --git a/core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateTests.java b/core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateIT.java
index 9ed0e59206..b4d05aeb3c 100644
--- a/core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateTests.java
+++ b/core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateIT.java
@@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 
 @ElasticsearchIntegrationTest.SuiteScopeTest
-public class RenderSearchTemplateTests extends ElasticsearchIntegrationTest {
+public class RenderSearchTemplateIT extends ElasticsearchIntegrationTest {
 
     private static final String TEMPLATE_CONTENTS = "{\"size\":\"{{size}}\",\"query\":{\"match\":{\"foo\":\"{{value}}\"}},\"aggs\":{\"objects\":{\"terms\":{\"field\":\"{{value}}\",\"size\":\"{{size}}\"}}}}";
     
diff --git a/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java b/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java
index 0026957fe7..edfbcf04c3 100644
--- a/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java
+++ b/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java
@@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.nullValue;
  *
  */
 @ClusterScope(randomDynamicTemplates = false, scope = Scope.SUITE)
-public class SimpleValidateQueryTests extends ElasticsearchIntegrationTest {
+public class SimpleValidateQueryIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void simpleValidateQuery() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java
index 11d49cef82..8edf2f2335 100644
--- a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java
+++ b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java
@@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.nullValue;
 /**
  *
  */
-public class ConcurrentDocumentOperationTests extends ElasticsearchIntegrationTest {
+public class ConcurrentDocumentOperationIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void concurrentOperationOnSameDocTest() throws Exception {
diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java
index d857163e76..d2c1c8bd66 100644
--- a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java
+++ b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java
@@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo;
 /**
  *
  */
-public class SimpleVersioningTests extends ElasticsearchIntegrationTest {
+public class SimpleVersioningIT extends ElasticsearchIntegrationTest {
 
     @Test
     public void testExternalVersioningInitialDelete() throws Exception {