diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerTest.java b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeControllerIntegrationTest.java
similarity index 93%
rename from spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerTest.java
rename to spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeControllerIntegrationTest.java
index 71e69cf419..2146fc09bc 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeControllerIntegrationTest.java
@@ -1,21 +1,5 @@
 package org.baeldung.boot.boottest;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.hasSize;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.baeldung.boot.boottest.Employee;
-import org.baeldung.boot.boottest.EmployeeRestController;
-import org.baeldung.boot.boottest.EmployeeService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,9 +12,22 @@ import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.hasSize;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 @RunWith(SpringRunner.class)
 @WebMvcTest(EmployeeRestController.class)
-public class EmployeeRestControllerTest {
+public class EmployeeControllerIntegrationTest {
 
     @Autowired
     private MockMvc mvc;
diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryTest.java b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryIntegrationTest.java
similarity index 98%
rename from spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryTest.java
rename to spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryIntegrationTest.java
index a29928bcca..cf94f4be49 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryIntegrationTest.java
@@ -17,7 +17,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @DataJpaTest
-public class EmployeeRepositoryTest {
+public class EmployeeRepositoryIntegrationTest {
 
     @Autowired
     private TestEntityManager entityManager;
diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntTest.java b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntegrationTest.java
similarity index 98%
rename from spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntTest.java
rename to spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntegrationTest.java
index 6ca8d267f9..110092d293 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntegrationTest.java
@@ -31,7 +31,7 @@ import org.springframework.test.web.servlet.MockMvc;
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = DemoApplication.class)
 @AutoConfigureMockMvc
 @TestPropertySource(locations = "classpath:application-integrationtest.properties")
-public class EmployeeRestControllerIntTest {
+public class EmployeeRestControllerIntegrationTest {
 
     @Autowired
     private MockMvc mvc;
diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplTest.java b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplIntegrationTest.java
similarity index 98%
rename from spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplTest.java
rename to spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplIntegrationTest.java
index acb884e851..e8a585a23e 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplIntegrationTest.java
@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-public class EmployeeServiceImplTest {
+public class EmployeeServiceImplIntegrationTest {
 
     @TestConfiguration
     static class EmployeeServiceImplTestContextConfiguration {