diff --git a/spring-cucumber/pom.xml b/spring-cucumber/pom.xml
index f3b9c983f0..b493962a75 100644
--- a/spring-cucumber/pom.xml
+++ b/spring-cucumber/pom.xml
@@ -73,17 +73,63 @@
 
         
 	</dependencies>
-	
-	
-	
+
+
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>**/*IntegrationTest.java</exclude>
+						<exclude>**/*LiveTest.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
+
+
+	<profiles>
+		<profile>
+			<id>integration</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>integration-test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<excludes>
+										<exclude>**/*LiveTest.java</exclude>
+									</excludes>
+									<includes>
+										<include>**/*IntegrationTest.java</include>
+									</includes>
+								</configuration>
+							</execution>
+						</executions>
+						<configuration>
+							<systemPropertyVariables>
+								<test.mime>json</test.mime>
+							</systemPropertyVariables>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 	
 
 </project>
diff --git a/spring-cucumber/src/test/java/com/baeldung/CucumberTest.java b/spring-cucumber/src/test/java/com/baeldung/CucumberIntegrationTest.java
similarity index 84%
rename from spring-cucumber/src/test/java/com/baeldung/CucumberTest.java
rename to spring-cucumber/src/test/java/com/baeldung/CucumberIntegrationTest.java
index c31a35b271..56eb810c09 100644
--- a/spring-cucumber/src/test/java/com/baeldung/CucumberTest.java
+++ b/spring-cucumber/src/test/java/com/baeldung/CucumberIntegrationTest.java
@@ -6,5 +6,5 @@ import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
 @CucumberOptions(features = "src/test/resources")
-public class CucumberTest {
+public class CucumberIntegrationTest {
 }
\ No newline at end of file
diff --git a/spring-cucumber/src/test/java/com/baeldung/OtherDefs.java b/spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java
similarity index 85%
rename from spring-cucumber/src/test/java/com/baeldung/OtherDefs.java
rename to spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java
index edbc14f319..17f298c3fb 100644
--- a/spring-cucumber/src/test/java/com/baeldung/OtherDefs.java
+++ b/spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java
@@ -3,7 +3,7 @@ package com.baeldung;
 import cucumber.api.java.en.Given;
 import cucumber.api.java.en.When;
 
-public class OtherDefs extends SpringIntegrationTest {
+public class OtherDefsIntegrationTest extends SpringIntegrationTest {
     @When("^the client calls /baeldung$")
     public void the_client_issues_POST_hello() throws Throwable {
         executePost("http://localhost:8080/baeldung");
diff --git a/spring-cucumber/src/test/java/com/baeldung/StepDefs.java b/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java
similarity index 93%
rename from spring-cucumber/src/test/java/com/baeldung/StepDefs.java
rename to spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java
index 865a1e13fa..8220d5e861 100644
--- a/spring-cucumber/src/test/java/com/baeldung/StepDefs.java
+++ b/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java
@@ -9,7 +9,7 @@ import cucumber.api.java.en.And;
 import cucumber.api.java.en.Then;
 import cucumber.api.java.en.When;
 
-public class StepDefs extends SpringIntegrationTest {
+public class StepDefsIntegrationTest extends SpringIntegrationTest {
 
     @When("^the client calls /version$")
     public void the_client_issues_GET_version() throws Throwable {