diff --git a/persistence-modules/spring-data-eclipselink/src/test/java/com/baeldung/eclipselink/springdata/repo/PersonsRepositoryTest.java b/persistence-modules/spring-data-eclipselink/src/test/java/com/baeldung/eclipselink/springdata/repo/PersonsRepositoryIntegrationTest.java
similarity index 95%
rename from persistence-modules/spring-data-eclipselink/src/test/java/com/baeldung/eclipselink/springdata/repo/PersonsRepositoryTest.java
rename to persistence-modules/spring-data-eclipselink/src/test/java/com/baeldung/eclipselink/springdata/repo/PersonsRepositoryIntegrationTest.java
index 1a7c28df6c..636f91cf8e 100644
--- a/persistence-modules/spring-data-eclipselink/src/test/java/com/baeldung/eclipselink/springdata/repo/PersonsRepositoryTest.java
+++ b/persistence-modules/spring-data-eclipselink/src/test/java/com/baeldung/eclipselink/springdata/repo/PersonsRepositoryIntegrationTest.java
@@ -14,13 +14,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsNull.notNullValue;
 
-/**
- * Created by adam.
- */
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
-public class PersonsRepositoryTest {
+public class PersonsRepositoryIntegrationTest {
 
 	@Autowired
 	private PersonsRepository personsRepository;
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java b/rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java
index 712f07324c..bc59f72fd9 100644
--- a/rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java
+++ b/rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java
@@ -194,6 +194,7 @@ public class SchedulersLiveTest {
     }
 
     @Test
+    @Ignore
     public void givenObservable_whenComputationScheduling_thenReturnThreadName() throws InterruptedException {
         System.out.println("computation");
         Observable.just("computation")
diff --git a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterIntegrationTest.java
similarity index 97%
rename from spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java
rename to spring-boot/src/test/java/org/baeldung/converter/CustomConverterIntegrationTest.java
index fb773fc44c..fc94fe7d7d 100644
--- a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java
+++ b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterIntegrationTest.java
@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = Application.class)
 @WebAppConfiguration
-public class CustomConverterTest {
+public class CustomConverterIntegrationTest {
 
     @Autowired
     ConversionService conversionService;
diff --git a/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java b/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerIntegrationTest.java
similarity index 95%
rename from spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java
rename to spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerIntegrationTest.java
index 06c3f740c2..3310eb9984 100644
--- a/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java
+++ b/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerIntegrationTest.java
@@ -19,7 +19,7 @@ import org.baeldung.boot.Application;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class)
 @AutoConfigureMockMvc
-public class StringToEmployeeConverterControllerTest {
+public class StringToEmployeeConverterControllerIntegrationTest {
 
     @Autowired
     private MockMvc mockMvc;
diff --git a/spring-rest-embedded-tomcat/pom.xml b/spring-rest-embedded-tomcat/pom.xml
index 554040e763..cee9933c0d 100644
--- a/spring-rest-embedded-tomcat/pom.xml
+++ b/spring-rest-embedded-tomcat/pom.xml
@@ -69,10 +69,30 @@
 
 	<build>
 		<finalName>spring-rest-embedded-tomcat</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <forkCount>3</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*LongRunningUnitTest.java</exclude>
+                        <exclude>**/*ManualTest.java</exclude>
+                        <exclude>**/JdbcTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+
+                </configuration>
+            </plugin>
+        </plugins>
 	</build>
 
 	<properties>
 		<spring.version>5.0.1.RELEASE</spring.version>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
 		<junit.version>4.12</junit.version>
 		<jackson.library>2.9.2</jackson.library>
 		<maven.compiler.source>1.8</maven.compiler.source>