diff --git a/source/META-INF/cxf/org.apache.cxf.Logger b/config/META-INF/cxf/org.apache.cxf.Logger
similarity index 100%
rename from source/META-INF/cxf/org.apache.cxf.Logger
rename to config/META-INF/cxf/org.apache.cxf.Logger
diff --git a/source/META-INF/services/org.apache.axis.deployment.wsdd.Provider b/config/META-INF/services/org.apache.axis.deployment.wsdd.Provider
similarity index 100%
rename from source/META-INF/services/org.apache.axis.deployment.wsdd.Provider
rename to config/META-INF/services/org.apache.axis.deployment.wsdd.Provider
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
index d92621f184..3e74d71bcb 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/site.lib.ftl
@@ -45,7 +45,7 @@
 	<#elseif roles = "managers">
 	"siteManagers":
 	[
-		<#assign managers = site.listMembers(null, "SiteManager", 0, true)?keys />
+		<#assign managers = site.listMembers("", "SiteManager", 0, true)?keys />
 		<#list managers as manager>
 			"${manager}"<#if manager_has_next>,</#if>
 		</#list>
diff --git a/pom.xml b/pom.xml
index 234f621b9f..b37ff2651f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,10 @@
                 	<artifactId>commons-logging</artifactId>
                 	<groupId>commons-logging</groupId>
                 </exclusion>
+                <exclusion>
+                  <groupId>org.freemarker</groupId>
+                  <artifactId>freemarker</artifactId>
+                </exclusion>            
             </exclusions>
         </dependency>
         <dependency>
@@ -235,6 +239,10 @@
                     <artifactId>commons-collections</artifactId>
                     <groupId>commons-collections</groupId>
                 </exclusion>
+                <exclusion>
+                  <groupId>org.freemarker</groupId>
+                  <artifactId>freemarker</artifactId>
+                </exclusion>   
             </exclusions>
         </dependency>
         <dependency>
@@ -271,8 +279,37 @@
             <version>7.3.0.v20110203</version>
         </dependency>
     </dependencies>
-
-    <build>
+   <profiles>
+      <profile>
+            <id>integration-tests</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                  <plugin>
+                     <artifactId>maven-surefire-plugin</artifactId>
+                     <executions>
+                        <execution>
+                           <id>integration-tests</id>
+                           <goals>
+                              <goal>test</goal>
+                           </goals>
+                           <configuration>
+                              <forkMode>always</forkMode>
+                              <includes combine.self="override">
+                                 <include>**/org/alfresco/RemoteApi*TestSuite.java</include>
+				 <include>**/org/alfresco/repo/webdav/PutMethodTest.java</include>
+                              </includes>
+                           </configuration>
+                        </execution>
+                     </executions>
+                  </plugin>
+                </plugins>
+            </build>
+        </profile>
+   </profiles>
+   <build>
         <plugins>
             <!-- Wipe the database before starting tests -->
             <plugin>
@@ -303,14 +340,18 @@
             </plugin>
 
             <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>always</forkMode>
-                    <includes combine.self="override">
-                        <include>**/org/alfresco/RemoteApi*TestSuite.java</include>
-                        <include>**/org/alfresco/repo/webdav/PutMethodTest.java</include>
-                    </includes>
-                </configuration>
+               <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/remoteapi/AllUnitTestsSuite.java</include>
+                          </includes>
+                     </configuration>
+                  </execution>
+               </executions>
             </plugin>
 
             <!-- We still use committed generated sources -->
diff --git a/source/test-java/org/alfresco/RemoteApi01TestSuite.java b/source/test-java/org/alfresco/RemoteApi01TestSuite.java
index 91caa56607..96430a8dc2 100644
--- a/source/test-java/org/alfresco/RemoteApi01TestSuite.java
+++ b/source/test-java/org/alfresco/RemoteApi01TestSuite.java
@@ -18,9 +18,9 @@
  */
 package org.alfresco;
 
+import junit.framework.JUnit4TestAdapter;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import junit.framework.JUnit4TestAdapter;
 
 /**
  * All Remote API project test classes and test suites as a sequence of RemoteApi&lt;NN>TestSuite
@@ -69,16 +69,9 @@ public class RemoteApi01TestSuite extends TestSuite
     
     static void tests5(TestSuite suite) // 
     {
-        suite.addTestSuite(org.alfresco.repo.web.util.PagingCursorTest.class);
-        suite.addTestSuite(org.alfresco.repo.web.util.paging.PagingTest.class);
-        suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.webdav.GetMethodTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.webdav.LockInfoImplTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.webdav.MoveMethodTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.webdav.RenameShuffleDetectionTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.webdav.UnlockMethodTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.webdav.WebDAVHelperIntegrationTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.webdav.WebDAVHelperTest.class));
-        suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.webdav.WebDAVLockServiceImplTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.webdav.WebDAVMethodTest.class));
         suite.addTestSuite(org.alfresco.repo.webservice.CMLUtilTest.class);
     }
@@ -97,7 +90,6 @@ public class RemoteApi01TestSuite extends TestSuite
     
     static void tests8(TestSuite suite) // 
     {
-        suite.addTest(new JUnit4TestAdapter(org.alfresco.rest.framework.tests.core.AllRestFrameworkTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.rest.workflow.api.tests.DeploymentWorkflowApiTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.rest.workflow.api.tests.ProcessDefinitionWorkflowApiTest.class));
     }
diff --git a/source/test-java/org/alfresco/remoteapi/AllUnitTestsSuite.java b/source/test-java/org/alfresco/remoteapi/AllUnitTestsSuite.java
new file mode 100644
index 0000000000..9350fcfaf8
--- /dev/null
+++ b/source/test-java/org/alfresco/remoteapi/AllUnitTestsSuite.java
@@ -0,0 +1,58 @@
+package org.alfresco.remoteapi;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.alfresco.repo.web.util.PagingCursorTest;
+import org.alfresco.repo.web.util.paging.PagingTest;
+import org.alfresco.repo.webdav.GetMethodTest;
+import org.alfresco.repo.webdav.LockInfoImplTest;
+import org.alfresco.repo.webdav.RenameShuffleDetectionTest;
+import org.alfresco.repo.webdav.WebDAVHelperTest;
+import org.alfresco.repo.webdav.WebDAVLockServiceImplTest;
+import org.alfresco.rest.framework.tests.core.AllRestFrameworkTest;
+import org.alfresco.rest.framework.tests.metadata.WriterTests;
+
+/**
+ * All Remote API 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();
+
+        publicApiTests(suite);
+        webdavTests(suite);
+        pagingTests(suite);
+
+        return suite;
+    }
+    
+    static void publicApiTests(TestSuite suite)
+    {
+        suite.addTest(new JUnit4TestAdapter(AllRestFrameworkTest.class));
+        suite.addTest(new JUnit4TestAdapter(WriterTests.class));
+    }
+    
+    static void webdavTests(TestSuite suite)
+    {
+        suite.addTest(new JUnit4TestAdapter(GetMethodTest.class));
+        suite.addTest(new JUnit4TestAdapter(LockInfoImplTest.class));
+        suite.addTest(new JUnit4TestAdapter(RenameShuffleDetectionTest.class));
+        suite.addTest(new JUnit4TestAdapter(WebDAVHelperTest.class));
+        suite.addTest(new JUnit4TestAdapter(WebDAVLockServiceImplTest.class));
+    }
+    
+    static void pagingTests(TestSuite suite)
+    {
+        suite.addTest(new JUnit4TestAdapter(PagingTest.class));
+        suite.addTest(new JUnit4TestAdapter(PagingCursorTest.class));
+    }
+}