diff --git a/cdi/pom.xml b/cdi/pom.xml
index b771857938..30dd167fa8 100644
--- a/cdi/pom.xml
+++ b/cdi/pom.xml
@@ -45,8 +45,60 @@
 
     </dependencies>
 
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <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>
     <properties>
         <spring.version>4.3.1.RELEASE</spring.version>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>        
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java b/cdi/src/test/java/com/baeldung/test/SpringInterceptorIntegrationTest.java
similarity index 95%
rename from cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java
rename to cdi/src/test/java/com/baeldung/test/SpringInterceptorIntegrationTest.java
index 1f3a8d83e3..cffa2256ca 100644
--- a/cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java
+++ b/cdi/src/test/java/com/baeldung/test/SpringInterceptorIntegrationTest.java
@@ -16,7 +16,7 @@ import com.baeldung.spring.service.SpringSuperService;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = { AppConfig.class })
-public class TestSpringInterceptor {
+public class SpringInterceptorIntegrationTest {
     @Autowired
     SpringSuperService springSuperService;