diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollectorIT.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollectorTests.java
similarity index 99%
rename from marvel/src/test/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollectorIT.java
rename to marvel/src/test/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollectorTests.java
index 56fcb75363b..331505480e3 100644
--- a/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollectorIT.java
+++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollectorTests.java
@@ -32,7 +32,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
 import static org.hamcrest.Matchers.*;
 
 @ESIntegTestCase.ClusterScope(numDataNodes = 0)
-public class IndexRecoveryCollectorIT extends ESIntegTestCase {
+public class IndexRecoveryCollectorTests extends ESIntegTestCase {
 
 
     @Override
diff --git a/shield/src/test/java/org/elasticsearch/shield/tribe/TribeIT.java b/shield/src/test/java/org/elasticsearch/shield/tribe/TribeTests.java
similarity index 99%
rename from shield/src/test/java/org/elasticsearch/shield/tribe/TribeIT.java
rename to shield/src/test/java/org/elasticsearch/shield/tribe/TribeTests.java
index 7157194290a..af8d70c01cf 100644
--- a/shield/src/test/java/org/elasticsearch/shield/tribe/TribeIT.java
+++ b/shield/src/test/java/org/elasticsearch/shield/tribe/TribeTests.java
@@ -36,7 +36,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.hamcrest.Matchers.*;
 
-public class TribeIT extends ShieldIntegTestCase {
+public class TribeTests extends ShieldIntegTestCase {
 
     //use known suite prefix since their threads are already ignored via ElasticsearchThreadFilter
     public static final String SECOND_CLUSTER_NODE_PREFIX =  SUITE_CLUSTER_NODE_PREFIX;
diff --git a/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleIT.java b/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleTests.java
similarity index 99%
rename from watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleIT.java
rename to watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleTests.java
index 4ca01f71dc4..7b42cf93d13 100644
--- a/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleIT.java
+++ b/watcher/src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleTests.java
@@ -50,7 +50,7 @@ import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 
-public class ActionThrottleIT extends AbstractWatcherIntegrationTests {
+public class ActionThrottleTests extends AbstractWatcherIntegrationTests {
 
     @Test
     public void testSingleActionAckThrottle() throws Exception {
diff --git a/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationIT.java b/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationTests.java
similarity index 98%
rename from watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationIT.java
rename to watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationTests.java
index 3bd3d0635a6..e8d99a10cc2 100644
--- a/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationIT.java
+++ b/watcher/src/test/java/org/elasticsearch/watcher/actions/webhook/WebhookHttpsIntegrationTests.java
@@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
-public class WebhookHttpsIntegrationIT extends AbstractWatcherIntegrationTests {
+public class WebhookHttpsIntegrationTests extends AbstractWatcherIntegrationTests {
 
     private int webPort;
     private MockWebServer webServer;
diff --git a/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpConnectionTimeoutIT.java b/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpConnectionTimeoutTests.java
similarity index 98%
rename from watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpConnectionTimeoutIT.java
rename to watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpConnectionTimeoutTests.java
index e70b47b93e3..c8011833356 100644
--- a/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpConnectionTimeoutIT.java
+++ b/watcher/src/test/java/org/elasticsearch/watcher/support/http/HttpConnectionTimeoutTests.java
@@ -19,7 +19,7 @@ import static org.mockito.Mockito.mock;
 
 /**
  */
-public class HttpConnectionTimeoutIT extends ESTestCase {
+public class HttpConnectionTimeoutTests extends ESTestCase {
 
     // setting an unroutable IP to simulate a connection timeout
     private static final String UNROUTABLE_IP = "192.168.255.255";
diff --git a/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/SlowWatchStatsIT.java b/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/SlowWatchStatsTests.java
similarity index 98%
rename from watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/SlowWatchStatsIT.java
rename to watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/SlowWatchStatsTests.java
index 69af545dd8a..10f11c4adfa 100644
--- a/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/SlowWatchStatsIT.java
+++ b/watcher/src/test/java/org/elasticsearch/watcher/transport/action/stats/SlowWatchStatsTests.java
@@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
 @ESIntegTestCase.ClusterScope(scope = TEST, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false, numDataNodes = 2)
-public class SlowWatchStatsIT extends AbstractWatcherIntegrationTests {
+public class SlowWatchStatsTests extends AbstractWatcherIntegrationTests {
 
     @Override
     protected boolean timeWarped() {