diff --git a/elasticsearch/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityIT.java b/elasticsearch/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityTests.java
similarity index 98%
rename from elasticsearch/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityIT.java
rename to elasticsearch/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityTests.java
index 1f3a4e6a5ba..1d233adb2af 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityIT.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/OldSecurityIndexBackwardsCompatibilityTests.java
@@ -70,7 +70,7 @@ import static org.hamcrest.Matchers.hasSize;
  *  <li>This document in {@code index3}: {@code {"title": "bwc_test_user should not see this index"}}</li>
  * </ul>
  **/
-public class OldSecurityIndexBackwardsCompatibilityIT extends AbstractOldXPackIndicesBackwardsCompatibilityTestCase {
+public class OldSecurityIndexBackwardsCompatibilityTests extends AbstractOldXPackIndicesBackwardsCompatibilityTestCase {
     private static final Version VERSION_5_1_0_UNRELEASED = Version.fromString("5.1.0");
 
     public void testUnreleasedVersion() {
diff --git a/elasticsearch/src/test/java/org/elasticsearch/integration/ShrinkIndexWithSecurityIT.java b/elasticsearch/src/test/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java
similarity index 97%
rename from elasticsearch/src/test/java/org/elasticsearch/integration/ShrinkIndexWithSecurityIT.java
rename to elasticsearch/src/test/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java
index 05cd462cc9c..e8db61c2975 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/integration/ShrinkIndexWithSecurityIT.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java
@@ -19,7 +19,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
  * Integration test that uses multiple data nodes to test that the shrink index api works with security.
  */
 @ClusterScope(minNumDataNodes = 2)
-public class ShrinkIndexWithSecurityIT extends SecurityIntegTestCase {
+public class ShrinkIndexWithSecurityTests extends SecurityIntegTestCase {
 
     @Override
     protected final boolean ignoreExternalCluster() {
diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityIT.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityTests.java
similarity index 99%
rename from elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityIT.java
rename to elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityTests.java
index b7c2d013dba..5823ee1452f 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityIT.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/OldMonitoringIndicesBackwardsCompatibilityTests.java
@@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.hasKey;
  */
 //Give ourselves 30 seconds instead o 5 to shut down. Sometimes it takes a while, especially on weak hardware. But we do get there.
 @ThreadLeakLingering(linger = 30000)
-public class OldMonitoringIndicesBackwardsCompatibilityIT extends AbstractOldXPackIndicesBackwardsCompatibilityTestCase {
+public class OldMonitoringIndicesBackwardsCompatibilityTests extends AbstractOldXPackIndicesBackwardsCompatibilityTestCase {
     private final boolean httpExporter = randomBoolean();
 
     @Override
diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityIT.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityTests.java
similarity index 98%
rename from elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityIT.java
rename to elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityTests.java
index 2d322ae9e65..cdf3d4d6edb 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityIT.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/watcher/OldWatcherIndicesBackwardsCompatibilityTests.java
@@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.not;
 /**
  * Tests for watcher indexes created before 5.0.
  */
-public class OldWatcherIndicesBackwardsCompatibilityIT extends AbstractOldXPackIndicesBackwardsCompatibilityTestCase {
+public class OldWatcherIndicesBackwardsCompatibilityTests extends AbstractOldXPackIndicesBackwardsCompatibilityTestCase {
     @Override
     public Settings nodeSettings(int ord) {
         return Settings.builder()