diff --git a/pom.xml b/pom.xml
index 1baf652a9d..1088c8cdf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,41 +257,13 @@
 
     <build>
         <plugins>
-            <!-- Wipe the database before starting tests -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>wipe-database</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <sqlCommand>drop database if exists alfresco</sqlCommand>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>create-database</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <sqlCommand>create database alfresco</sqlCommand>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- CLOUD-1967 Put core log4j config in WEB-INF/classes, so that it's first in classloader -->
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>fetch-log4j-config</id>
-                        <phase>generate-resources</phase>
+                        <phase>prepare-package</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
@@ -355,6 +327,20 @@
 						<phase>prepare-package</phase>
 					</execution>
 				</executions>
+            </plugin>    
+            <plugin>
+               <artifactId>maven-surefire-plugin</artifactId>
+               <executions>
+                  <execution>
+                     <id>default-test</id>
+                     <!-- There's also surefire configuration in the integration-tests profile -->
+                     <configuration>
+                          <includes>
+                              <include>**/org/alfresco/web/AllUnitTestsSuite.java</include>
+                          </includes>
+                     </configuration>
+                  </execution>
+               </executions>
             </plugin>
         </plugins>
     </build>
@@ -451,6 +437,61 @@
 				</plugins>
 			</build>
 		</profile>
+      <profile>
+         <id>integration-tests</id>
+         <activation>
+             <activeByDefault>false</activeByDefault>
+         </activation>
+         <build>
+             <plugins>
+                 <!-- Wipe the database before starting tests -->
+                 <plugin>
+                     <groupId>org.codehaus.mojo</groupId>
+                     <artifactId>sql-maven-plugin</artifactId>
+                     <executions>
+                         <execution>
+                             <id>wipe-database</id>
+                             <phase>process-test-resources</phase>
+                             <goals>
+                                 <goal>execute</goal>
+                             </goals>
+                             <configuration>
+                                 <sqlCommand>drop database if exists alfresco</sqlCommand>
+                             </configuration>
+                         </execution>
+                         <execution>
+                             <id>create-database</id>
+                             <phase>process-test-resources</phase>
+                             <goals>
+                                 <goal>execute</goal>
+                             </goals>
+                             <configuration>
+                                 <sqlCommand>create database alfresco</sqlCommand>
+                             </configuration>
+                         </execution>
+                     </executions>
+                 </plugin>
+                 <plugin>
+                     <artifactId>maven-surefire-plugin</artifactId>
+                     <executions>
+                        <execution>
+                           <id>integration-tests</id>
+                           <goals>
+                              <goal>test</goal>
+                           </goals>
+                           <configuration>
+                             <includes>
+                               <include>**/org/alfresco/web/app/servlet/DefaultRemoteUserMapperTest.java</include>
+                               <include>**/org/alfresco/web/app/servlet/KerberosRemoteUserMapperTest.java</include>
+                               <include>**/org/alfresco/web/forms/FormsTest.java</include>
+                             </includes>
+                           </configuration>
+                        </execution>
+                     </executions>
+                 </plugin>
+             </plugins>
+         </build>
+      </profile>
 		<!-- Tweaks required to make the build work in Eclipse -->
 		<profile>
 			<id>m2e</id>
diff --git a/source/test-java/org/alfresco/web/AllUnitTestsSuite.java b/source/test-java/org/alfresco/web/AllUnitTestsSuite.java
new file mode 100644
index 0000000000..c72c175d69
--- /dev/null
+++ b/source/test-java/org/alfresco/web/AllUnitTestsSuite.java
@@ -0,0 +1,35 @@
+package org.alfresco.web;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.alfresco.web.app.ResourceBundleWrapperTest;
+import org.alfresco.web.app.servlet.AuthenticationFilterTest;
+import org.alfresco.web.config.WebClientConfigTest;
+import org.alfresco.web.forms.XMLUtilTest;
+import org.alfresco.web.forms.xforms.Schema2XFormsTest;
+
+/**
+ * All Alfresco web client project UNIT test classes should be added to this test suite.
+ */
+public class AllUnitTestsSuite extends TestSuite
+{
+    /**
+     * Creates the test suite
+     *
+     * @return  the test suite
+     */
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite();
+
+        suite.addTest(new JUnit4TestAdapter(AuthenticationFilterTest.class));
+        suite.addTestSuite(ResourceBundleWrapperTest.class);
+        suite.addTestSuite(WebClientConfigTest.class);
+        suite.addTestSuite(Schema2XFormsTest.class);
+        suite.addTestSuite(XMLUtilTest.class);
+        return suite;
+    }
+ 
+}