diff --git a/spring-boot/src/test/java/com/baeldung/shutdown/ShutdownApplicationTest.java b/spring-boot/src/test/java/com/baeldung/shutdown/ShutdownApplicationIntegrationTest.java
similarity index 96%
rename from spring-boot/src/test/java/com/baeldung/shutdown/ShutdownApplicationTest.java
rename to spring-boot/src/test/java/com/baeldung/shutdown/ShutdownApplicationIntegrationTest.java
index e4db0bd1e7..d9351b7203 100644
--- a/spring-boot/src/test/java/com/baeldung/shutdown/ShutdownApplicationTest.java
+++ b/spring-boot/src/test/java/com/baeldung/shutdown/ShutdownApplicationIntegrationTest.java
@@ -18,7 +18,7 @@ import org.springframework.web.context.WebApplicationContext;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = Application.class)
 @AutoConfigureMockMvc
-public class ShutdownApplicationTest {
+public class ShutdownApplicationIntegrationTest {
 
     @Autowired
     private MockMvc mockMvc;
diff --git a/spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithKeyValueTemplateTest.java b/spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithKeyValueRepositoryIntegrationTest.java
similarity index 97%
rename from spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithKeyValueTemplateTest.java
rename to spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithKeyValueRepositoryIntegrationTest.java
index 78e985fe4b..e376f1b804 100644
--- a/spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithKeyValueTemplateTest.java
+++ b/spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithKeyValueRepositoryIntegrationTest.java
@@ -22,7 +22,7 @@ import com.baeldung.spring.data.keyvalue.vo.Employee;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = SpringDataKeyValueApplication.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class EmployeeServicesWithKeyValueTemplateTest {
+public class EmployeeServicesWithKeyValueRepositoryIntegrationTest {
 	
 	@Autowired
 	@Qualifier("employeeServicesWithKeyValueTemplate")
diff --git a/spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithRepositoryTest.java b/spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithRepositoryIntegrationTest.java
similarity index 97%
rename from spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithRepositoryTest.java
rename to spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithRepositoryIntegrationTest.java
index 5b32728893..bb034d6aee 100644
--- a/spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithRepositoryTest.java
+++ b/spring-data-keyvalue/src/test/java/com/baeldung/spring/data/keyvalue/services/test/EmployeeServicesWithRepositoryIntegrationTest.java
@@ -22,7 +22,7 @@ import com.baeldung.spring.data.keyvalue.vo.Employee;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = SpringDataKeyValueApplication.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class EmployeeServicesWithRepositoryTest {
+public class EmployeeServicesWithRepositoryIntegrationTest {
 
 	@Autowired
 	@Qualifier("employeeServicesWithRepository")
diff --git a/testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateIntegrationTest.java
similarity index 97%
rename from testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateIntegrationTest.java
index f942721504..1a0b46f41f 100644
--- a/testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java
+++ b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/karate/KarateIntegrationTest.java
@@ -12,7 +12,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 
 @RunWith(Karate.class)
 @CucumberOptions(features = "classpath:karate")
-public class KarateUnitTest {
+public class KarateIntegrationTest {
 
     private static final WireMockServer wireMockServer = new WireMockServer();