31 files changed, 29 insertions, 34 deletions

diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/component/index/ComponentIndexerIT.java
index 9cbaeece04f..eda1f4e137e 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/component/index/ComponentIndexerIT.java
@@ -48,7 +48,7 @@ import static org.sonar.server.es.ProjectIndexer.Cause.PROJECT_CREATION;
 import static org.sonar.server.es.ProjectIndexer.Cause.PROJECT_DELETION;
 import static org.sonar.server.es.newindex.DefaultIndexSettingsElement.SORTABLE_ANALYZER;
 
-public class ComponentIndexerTest {
+public class ComponentIndexerIT {
 
   private System2 system2 = System2.INSTANCE;
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/BulkIndexerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/es/BulkIndexerIT.java
index 686e0449d13..774e3bdc0a3 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/BulkIndexerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/es/BulkIndexerIT.java
@@ -46,7 +46,7 @@ import static org.sonar.server.es.newindex.FakeIndexDefinition.EXCPECTED_TYPE_FA
 import static org.sonar.server.es.newindex.FakeIndexDefinition.INDEX;
 import static org.sonar.server.es.newindex.FakeIndexDefinition.TYPE_FAKE;
 
-public class BulkIndexerTest {
+public class BulkIndexerIT {
 
   private final TestSystem2 testSystem2 = new TestSystem2().setNow(1_000L);
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/OneToManyResilientIndexingListenerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/es/OneToManyResilientIndexingListenerIT.java
index 95293d3146f..f5afa0a9a18 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/OneToManyResilientIndexingListenerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/es/OneToManyResilientIndexingListenerIT.java
@@ -35,7 +35,7 @@ import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.issue.index.IssueIndexDefinition.TYPE_ISSUE;
 
-public class OneToManyResilientIndexingListenerTest {
+public class OneToManyResilientIndexingListenerIT {
 
   @Rule
   public EsTester es = EsTester.create();
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/OneToOneResilientIndexingListenerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/es/OneToOneResilientIndexingListenerIT.java
index 8778986296e..92c474d7727 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/OneToOneResilientIndexingListenerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/es/OneToOneResilientIndexingListenerIT.java
@@ -35,7 +35,7 @@ import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.issue.index.IssueIndexDefinition.TYPE_ISSUE;
 
-public class OneToOneResilientIndexingListenerTest {
+public class OneToOneResilientIndexingListenerIT {
 
   @Rule
   public EsTester es = EsTester.create();
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/es/metadata/MetadataIndexIT.java
index 133744cd8c5..1c48ebbbf0d 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/es/metadata/MetadataIndexIT.java
@@ -38,7 +38,7 @@ import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(DataProviderRunner.class)
-public class MetadataIndexTest {
+public class MetadataIndexIT {
 
   @Rule
   public EsTester es = EsTester.createCustom(new MetadataIndexDefinitionBridge(), new FakeIndexDefinition());
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/favorite/FavoriteUpdaterIT.java
index 2f876a9c65f..8a7c4ae8498 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/favorite/FavoriteUpdaterIT.java
@@ -32,7 +32,7 @@ import org.sonar.db.user.UserDto;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class FavoriteUpdaterTest {
+public class FavoriteUpdaterIT {
 
   @Rule
   public DbTester db = DbTester.create();
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java
index d005db3e99d..dae2aeb826f 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIndexerIT.java
@@ -65,7 +65,7 @@ import static org.sonar.server.issue.index.IssueIndexDefinition.TYPE_ISSUE;
 import static org.sonar.server.permission.index.IndexAuthorizationConstants.TYPE_AUTHORIZATION;
 import static org.sonar.server.security.SecurityStandards.SANS_TOP_25_POROUS_DEFENSES;
 
-public class IssueIndexerTest {
+public class IssueIndexerIT {
 
   @Rule
   public EsTester es = EsTester.create();
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIteratorFactoryIT.java
index 8147a036654..594b876f405 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/issue/index/IssueIteratorFactoryIT.java
@@ -38,7 +38,7 @@ import static org.sonar.db.component.ComponentTesting.newDirectory;
 import static org.sonar.db.component.ComponentTesting.newFileDto;
 import static org.sonar.db.issue.IssueTesting.newCodeReferenceIssue;
 
-public class IssueIteratorFactoryTest {
+public class IssueIteratorFactoryIT {
 
   @Rule
   public DbTester dbTester = DbTester.create(System2.INSTANCE);
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/issue/notification/NewIssuesNotificationIT.java
index cdbd37ae0d6..4cba1b8c865 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/NewIssuesNotificationTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/issue/notification/NewIssuesNotificationIT.java
@@ -53,7 +53,7 @@ import static org.sonar.server.issue.notification.NewIssuesStatistics.Metric.RUL
 import static org.sonar.server.issue.notification.NewIssuesStatistics.Metric.RULE_TYPE;
 import static org.sonar.server.issue.notification.NewIssuesStatistics.Metric.TAG;
 
-public class NewIssuesNotificationTest {
+public class NewIssuesNotificationIT {
 
   @Rule
   public DbTester db = DbTester.create();
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/measure/index/ProjectMeasuresIndexerIT.java
index 294e2f3dfe2..541cc03bd93 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/measure/index/ProjectMeasuresIndexerIT.java
@@ -62,7 +62,7 @@ import static org.sonar.server.measure.index.ProjectMeasuresIndexDefinition.FIEL
 import static org.sonar.server.measure.index.ProjectMeasuresIndexDefinition.TYPE_PROJECT_MEASURES;
 import static org.sonar.server.permission.index.IndexAuthorizationConstants.TYPE_AUTHORIZATION;
 
-public class ProjectMeasuresIndexerTest {
+public class ProjectMeasuresIndexerIT {
 
   private final System2 system2 = System2.INSTANCE;
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/metric/MetricFinderTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/metric/MetricFinderIT.java
index 69bf0f745f4..81b527327ef 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/metric/MetricFinderTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/metric/MetricFinderIT.java
@@ -30,7 +30,7 @@ import org.sonar.db.metric.MetricDto;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.db.metric.MetricTesting.newMetricDto;
 
-public class MetricFinderTest {
+public class MetricFinderIT {
 
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/platform/StartupMetadataProviderTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/platform/StartupMetadataProviderIT.java
index a2bc420a051..6bb87bbbd2d 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/platform/StartupMetadataProviderTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/platform/StartupMetadataProviderIT.java
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.sonar.api.utils.DateUtils.formatDateTime;
 
-public class StartupMetadataProviderTest {
+public class StartupMetadataProviderIT {
   private static final long A_DATE = 1_500_000_000_000L;
 
   @Rule
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/platform/monitoring/DbSectionTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/platform/monitoring/DbSectionIT.java
index 8a17a07deef..6ce981076c2 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/platform/monitoring/DbSectionTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/platform/monitoring/DbSectionIT.java
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.sonar.process.systeminfo.SystemInfoUtils.attribute;
 
-public class DbSectionTest {
+public class DbSectionIT {
 
   @Rule
   public final DbTester dbTester = DbTester.create(System2.INSTANCE);
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateFinderTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/qualitygate/QualityGateFinderIT.java
index 52fe0879a12..27fe578fbe8 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateFinderTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/qualitygate/QualityGateFinderIT.java
@@ -30,7 +30,7 @@ import org.sonar.db.qualitygate.QualityGateDto;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public class QualityGateFinderTest {
+public class QualityGateFinderIT {
 
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerIT.java
index 414482944be..60ffc0f0a06 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerIT.java
@@ -42,7 +42,7 @@ import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.rule.index.RuleIndexDefinition.TYPE_ACTIVE_RULE;
 
-public class ActiveRuleIndexerTest {
+public class ActiveRuleIndexerIT {
 
   private System2 system2 = System2.INSTANCE;
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/rule/DefaultRuleFinderIT.java
index 92e97d83069..619ffd88f91 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/rule/DefaultRuleFinderIT.java
@@ -38,7 +38,7 @@ import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-public class DefaultRuleFinderTest {
+public class DefaultRuleFinderIT {
 
   @org.junit.Rule
   public DbTester dbTester = DbTester.create(System2.INSTANCE);
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/rule/index/RuleIndexDefinitionIT.java
index 36ccc3a5a28..b90fe9a2f77 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/rule/index/RuleIndexDefinitionIT.java
@@ -48,7 +48,7 @@ import static org.sonar.server.rule.index.RuleIndexDefinition.FIELD_RULE_REPOSIT
 import static org.sonar.server.rule.index.RuleIndexDefinition.FIELD_RULE_UUID;
 import static org.sonar.server.rule.index.RuleIndexDefinition.TYPE_RULE;
 
-public class RuleIndexDefinitionTest {
+public class RuleIndexDefinitionIT {
 
   private MapSettings settings = new MapSettings();
   private RuleIndexDefinition underTest = new RuleIndexDefinition(settings.asConfig());
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/rule/index/RuleIndexIT.java
index 7c8f66c2ae3..6a391e43abb 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/rule/index/RuleIndexIT.java
@@ -92,7 +92,7 @@ import static org.sonar.server.rule.index.RuleIndexDefinition.TYPE_RULE;
 import static org.sonar.server.security.SecurityStandards.SANS_TOP_25_INSECURE_INTERACTION;
 import static org.sonar.server.security.SecurityStandards.SANS_TOP_25_RISKY_RESOURCE;
 
-public class RuleIndexTest {
+public class RuleIndexIT {
 
   private final System2 system2 = new AlwaysIncreasingSystem2();
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/rule/index/RuleIndexerIT.java
index 9ab742a1f94..e096598bfcc 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/rule/index/RuleIndexerIT.java
@@ -61,7 +61,7 @@ import static org.sonar.server.security.SecurityStandards.CWES_BY_SQ_CATEGORY;
 import static org.sonar.server.security.SecurityStandards.SQ_CATEGORY_KEYS_ORDERING;
 
 @RunWith(DataProviderRunner.class)
-public class RuleIndexerTest {
+public class RuleIndexerIT {
 
   private static final String VALID_HOTSPOT_RULE_DESCRIPTION = "acme\n" +
     "<h2>Ask Yourself Whether</h2>\n" +
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/setting/DatabaseSettingLoaderTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/setting/DatabaseSettingLoaderIT.java
index 25f3e706fa7..70afe0d814b 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/setting/DatabaseSettingLoaderTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/setting/DatabaseSettingLoaderIT.java
@@ -29,7 +29,7 @@ import org.sonar.db.property.PropertyDto;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.MapEntry.entry;
 
-public class DatabaseSettingLoaderTest {
+public class DatabaseSettingLoaderIT {
 
   private static final String A_KEY = "a_key";
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/setting/ProjectConfigurationLoaderImplIT.java
index b27b30327a4..86abf38a6ed 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/setting/ProjectConfigurationLoaderImplIT.java
@@ -25,18 +25,13 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.api.config.Configuration;
 import org.sonar.api.config.internal.MapSettings;
-import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
-import org.sonar.db.property.PropertiesDao;
 
 import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
-public class ProjectConfigurationLoaderImplTest {
+public class ProjectConfigurationLoaderImplIT {
   @Rule
   public DbTester db = DbTester.create();
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/user/index/UserIndexTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/user/index/UserIndexIT.java
index c75c1edddca..e2d7afea84f 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/user/index/UserIndexTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/user/index/UserIndexIT.java
@@ -34,7 +34,7 @@ import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.user.index.UserIndexDefinition.TYPE_USER;
 
-public class UserIndexTest {
+public class UserIndexIT {
 
   private static final String USER1_LOGIN = "user1";
   private static final String USER2_LOGIN = "user2";
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/user/index/UserIndexerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/user/index/UserIndexerIT.java
index 707361ed7fa..b42ae32968a 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/user/index/UserIndexerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/user/index/UserIndexerIT.java
@@ -32,7 +32,7 @@ import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.user.index.UserIndexDefinition.TYPE_USER;
 
-public class UserIndexerTest {
+public class UserIndexerIT {
 
   private final System2 system2 = System2.INSTANCE;
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/view/index/ViewIndexTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/view/index/ViewIndexIT.java
index 301f585015b..dca9cd2a3a9 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/view/index/ViewIndexTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/view/index/ViewIndexIT.java
@@ -29,7 +29,7 @@ import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.view.index.ViewIndexDefinition.TYPE_VIEW;
 
-public class ViewIndexTest {
+public class ViewIndexIT {
 
   @Rule
   public EsTester es = EsTester.create();
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/view/index/ViewIndexerIT.java
index 51cadcc7ce5..3365bcabf75 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/view/index/ViewIndexerIT.java
@@ -44,7 +44,7 @@ import static org.sonar.db.component.ComponentTesting.newProjectCopy;
 import static org.sonar.db.component.ComponentTesting.newSubPortfolio;
 import static org.sonar.server.view.index.ViewIndexDefinition.TYPE_VIEW;
 
-public class ViewIndexerTest {
+public class ViewIndexerIT {
 
   @Rule
   public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(60));
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/AsynchronousWebHooksImplIT.java
index acb4ef40b39..4ae11955ae3 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/AsynchronousWebHooksImplIT.java
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.verifyNoInteractions;
 import static org.sonar.db.DbTester.create;
 import static org.sonar.db.webhook.WebhookTesting.newGlobalWebhook;
 
-public class AsynchronousWebHooksImplTest {
+public class AsynchronousWebHooksImplIT {
 
   private final System2 system2 = mock(System2.class);
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/SynchronousWebHooksImplIT.java
index 8e673085fee..f671da1fb65 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/SynchronousWebHooksImplIT.java
@@ -45,7 +45,7 @@ import static org.sonar.db.DbTester.create;
 import static org.sonar.db.webhook.WebhookTesting.newGlobalWebhook;
 import static org.sonar.db.webhook.WebhookTesting.newWebhook;
 
-public class SynchronousWebHooksImplTest {
+public class SynchronousWebHooksImplIT {
 
   private static final long NOW = 1_500_000_000_000L;
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/WebhookDeliveryStorageIT.java
index 47e0e319c06..6805bfeafc1 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java
+++ b/server/sonar-server-common/src/it/java/org/sonar/server/webhook/WebhookDeliveryStorageIT.java
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.sonar.db.webhook.WebhookDeliveryTesting.selectAllDeliveryUuids;
 
-public class WebhookDeliveryStorageTest {
+public class WebhookDeliveryStorageIT {
 
   private static final String DELIVERY_UUID = "abcde1234";
   private static final long NOW = 1_500_000_000_000L;
diff --git a/server/sonar-server-common/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml b/server/sonar-server-common/src/it/resources/org/sonar/server/issue/index/IssueIndexerIT/index.xml
index 31b217d461e..31b217d461e 100644
--- a/server/sonar-server-common/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index.xml
+++ b/server/sonar-server-common/src/it/resources/org/sonar/server/issue/index/IssueIndexerIT/index.xml
diff --git a/server/sonar-server-common/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml b/server/sonar-server-common/src/it/resources/org/sonar/server/issue/index/IssueIndexerIT/index_project.xml
index 2800fccb72b..2800fccb72b 100644
--- a/server/sonar-server-common/src/test/resources/org/sonar/server/issue/index/IssueIndexerTest/index_project.xml
+++ b/server/sonar-server-common/src/it/resources/org/sonar/server/issue/index/IssueIndexerIT/index_project.xml
diff --git a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java b/sonar-core/src/it/java/org/sonar/core/util/DefaultHttpDownloaderIT.java
index e8d5a17b5f8..9e13d276e25 100644
--- a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
+++ b/sonar-core/src/it/java/org/sonar/core/util/DefaultHttpDownloaderIT.java
@@ -62,7 +62,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class DefaultHttpDownloaderTest {
+public class DefaultHttpDownloaderIT {
 
   @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder();