diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml
index 4f5cd0c290..d4dabcc274 100644
--- a/spring-hibernate4/pom.xml
+++ b/spring-hibernate4/pom.xml
@@ -185,7 +185,7 @@
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <excludes>
-                        <!-- <exclude>**/*ProductionTest.java</exclude> -->
+                         <exclude>**/*IntegrationTest.java</exclude>
                     </excludes>
                     <systemPropertyVariables>
                         <!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
@@ -193,27 +193,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <version>${cargo-maven2-plugin.version}</version>
-                <configuration>
-                    <wait>true</wait>
-                    <container>
-                        <containerId>jetty8x</containerId>
-                        <type>embedded</type>
-                        <systemProperties>
-                            <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
-                        </systemProperties>
-                    </container>
-                    <configuration>
-                        <properties>
-                            <cargo.servlet.port>8082</cargo.servlet.port>
-                        </properties>
-                    </configuration>
-                </configuration>
-            </plugin>
-
         </plugins>
 
     </build>
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTest.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
similarity index 99%
rename from spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTest.java
rename to spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
index 88186098cc..2275bf14f2 100644
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTest.java
+++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
@@ -12,7 +12,7 @@ import com.baeldung.hibernate.criteria.model.Item;
 import com.baeldung.hibernate.criteria.util.HibernateUtil;
 import com.baeldung.hibernate.criteria.view.ApplicationView;
 
-public class HibernateCriteriaTest {
+public class HibernateCriteriaIntegrationTest {
 
     final private ApplicationView av = new ApplicationView();
 
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java
index 2911fb4725..dc1040734f 100644
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java
+++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java
@@ -4,7 +4,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ HibernateCriteriaTest.class })
+@Suite.SuiteClasses({ HibernateCriteriaIntegrationTest.class })
 
 public class HibernateCriteriaTestSuite {
 
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingIntegrationTest.java
similarity index 96%
rename from spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java
rename to spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingIntegrationTest.java
index 42245ca89e..65bf36f8bf 100644
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingTest.java
+++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingIntegrationTest.java
@@ -11,7 +11,7 @@ import java.util.Set;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class HibernateFetchingTest {
+public class HibernateFetchingIntegrationTest {
 
     // this loads sample data in the database
     @Before
diff --git a/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/AuditTestSuite.java b/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/AuditTestSuite.java
index 8a8a3445f6..34c725d62b 100644
--- a/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/AuditTestSuite.java
+++ b/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/AuditTestSuite.java
@@ -5,9 +5,9 @@ import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({ // @formatter:off
-    EnversFooBarAuditTest.class,
-    JPABarAuditTest.class,
-    SpringDataJPABarAuditTest.class
+    EnversFooBarAuditIntegrationTest.class,
+    JPABarAuditIntegrationTest.class,
+    SpringDataJPABarAuditIntegrationTest.class
 }) // @formatter:on
 public class AuditTestSuite {
     //
diff --git a/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditTest.java b/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java
similarity index 98%
rename from spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditTest.java
rename to spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java
index 6c13816b63..ed2e111c8f 100644
--- a/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditTest.java
+++ b/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java
@@ -28,9 +28,9 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class EnversFooBarAuditTest {
+public class EnversFooBarAuditIntegrationTest {
 
-    private static Logger logger = LoggerFactory.getLogger(EnversFooBarAuditTest.class);
+    private static Logger logger = LoggerFactory.getLogger(EnversFooBarAuditIntegrationTest.class);
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
diff --git a/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/JPABarAuditTest.java b/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/JPABarAuditIntegrationTest.java
similarity index 97%
rename from spring-hibernate4/src/test/java/com/baeldung/persistence/audit/JPABarAuditTest.java
rename to spring-hibernate4/src/test/java/com/baeldung/persistence/audit/JPABarAuditIntegrationTest.java
index 1e4a10f61c..b63a4b989b 100644
--- a/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/JPABarAuditTest.java
+++ b/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/JPABarAuditIntegrationTest.java
@@ -27,9 +27,9 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class JPABarAuditTest {
+public class JPABarAuditIntegrationTest {
 
-    private static Logger logger = LoggerFactory.getLogger(JPABarAuditTest.class);
+    private static Logger logger = LoggerFactory.getLogger(JPABarAuditIntegrationTest.class);
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
diff --git a/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditTest.java b/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditIntegrationTest.java
similarity index 96%
rename from spring-hibernate4/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditTest.java
rename to spring-hibernate4/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditIntegrationTest.java
index 05c0e9fa83..e794b282f6 100644
--- a/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditTest.java
+++ b/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditIntegrationTest.java
@@ -26,9 +26,9 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class SpringDataJPABarAuditTest {
+public class SpringDataJPABarAuditIntegrationTest {
 
-    private static Logger logger = LoggerFactory.getLogger(SpringDataJPABarAuditTest.class);
+    private static Logger logger = LoggerFactory.getLogger(SpringDataJPABarAuditIntegrationTest.class);
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {