diff --git a/spring-all/src/test/java/org/baeldung/customscope/TenantScopeTest.java b/spring-all/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java
similarity index 98%
rename from spring-all/src/test/java/org/baeldung/customscope/TenantScopeTest.java
rename to spring-all/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java
index f6cce4d9f2..e873ac5065 100644
--- a/spring-all/src/test/java/org/baeldung/customscope/TenantScopeTest.java
+++ b/spring-all/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java
@@ -11,7 +11,7 @@ import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-public class TenantScopeTest {
+public class TenantScopeIntegrationTest {
 
     @Test
     public final void whenRegisterScopeAndBeans_thenContextContainsFooAndBar() {
diff --git a/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorTest.java b/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
similarity index 94%
rename from spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorTest.java
rename to spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
index 5f79bdbbb8..96265c11f5 100644
--- a/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorTest.java
+++ b/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java
@@ -8,7 +8,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class SquareCalculatorTest {
+public class SquareCalculatorUnitTest {
     private SquaredCalculator squaredCalculator = new SquaredCalculator();
     private CacheHelper cacheHelper = new CacheHelper();
 
diff --git a/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLTest.java b/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
similarity index 96%
rename from spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLTest.java
rename to spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
index 15c9265a13..2b46a50588 100644
--- a/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLTest.java
+++ b/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 
-public class SpringProfilesWithXMLTest {
+public class SpringProfilesWithXMLIntegrationTest {
 
     private ClassPathXmlApplicationContext classPathXmlApplicationContext;