diff --git a/pom.xml b/pom.xml
index aaa252ff2f..b9be6d85a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,16 +302,41 @@
                 </executions>
             </plugin>
 
-            <!-- Exclude tests which should not run -->
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <failIfNoTests>false</failIfNoTests>
+                    <!-- Exclude tests which should not run -->
                     <excludes>
                         <exclude>**/*SystemTest.*</exclude>
+                        <exclude>**/org/alfresco/rest/api/tests/Test*.*</exclude> <!--included in ApiTest and TestCMISAPI -->
                         <exclude>**/org/alfresco/repo/cmis/ws/*Test.*</exclude>
+                        <exclude>**/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.*</exclude>
+                        <exclude>**/*$*</exclude>
                     </excludes>
                 </configuration>
+                <executions>
+                    <!-- Default execution, for tests with a shared JVM -->
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory</excludedGroups>
+                        </configuration>
+                    </execution>
+                    <!-- Execution for tests which require their own JVM -->
+                    <execution>
+                        <id>run-ownJVMTestsCategory</id>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <forkMode>always</forkMode>
+                            <groups>org.alfresco.test_category.OwnJVMTestsCategory</groups>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
+
             <!-- We still use committed generated sources -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/source/test-java/org/alfresco/repo/web/scripts/admin/AdminWebScriptTest.java b/source/test-java/org/alfresco/repo/web/scripts/admin/AdminWebScriptTest.java
index 4e52fe6271..fd8a0ff91b 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/admin/AdminWebScriptTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/admin/AdminWebScriptTest.java
@@ -29,7 +29,9 @@ import org.alfresco.service.cmr.admin.RepoUsage.UsageType;
 import org.alfresco.service.cmr.admin.RepoUsageStatus;
 import org.alfresco.service.descriptor.DescriptorService;
 import org.alfresco.service.license.LicenseDescriptor;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.json.JSONObject;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.TestWebScriptServer;
@@ -41,6 +43,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
  * @author Derek Hulley
  * @since 3.4
  */
+@Category(OwnJVMTestsCategory.class)
 public class AdminWebScriptTest extends BaseWebScriptTest
 {
     private ApplicationContext ctx;
diff --git a/source/test-java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java b/source/test-java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java
index 238cecae53..c21e785113 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java
@@ -31,8 +31,10 @@ import org.alfresco.repo.web.scripts.BaseWebScriptTest;
 import org.alfresco.service.cmr.audit.AuditService;
 import org.alfresco.service.cmr.audit.AuditService.AuditApplication;
 import org.alfresco.service.cmr.security.AuthenticationService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 import org.springframework.extensions.surf.util.ISO8601DateFormat;
 import org.springframework.extensions.webscripts.Status;
@@ -46,6 +48,7 @@ import org.springframework.util.ResourceUtils;
  * @author Derek Hulley
  * @since 3.4
  */
+@Category(OwnJVMTestsCategory.class)
 public class AuditWebScriptTest extends BaseWebScriptTest
 {
     private static final String APP_REPOTEST_NAME = "AlfrescoRepositoryTest";
diff --git a/source/test-java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorWebScriptTest.java b/source/test-java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorWebScriptTest.java
index 15d469fa71..74954e3ed9 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorWebScriptTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorWebScriptTest.java
@@ -39,8 +39,10 @@ import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.cmr.site.SiteVisibility;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.GUID;
 import org.json.JSONObject;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 import org.springframework.extensions.surf.util.URLEncoder;
 import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
@@ -50,6 +52,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
  * @author Nick Smith
  * @since 4.0
  */
+@Category(OwnJVMTestsCategory.class)
 public class NodeLocatorWebScriptTest extends BaseWebScriptTest
 {
     private static final String baseURL = "api/nodelocator/";
diff --git a/source/test-java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java b/source/test-java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java
index 00308edcb8..c0a2228c53 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java
@@ -35,8 +35,10 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.GUID;
 import org.alfresco.util.PropertyMap;
+import org.junit.experimental.categories.Category;
 import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
 import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
 import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
@@ -48,6 +50,7 @@ import org.json.JSONObject;
  * 
  * @author Roy Wetherall
  */
+@Category(OwnJVMTestsCategory.class)
 public class ThumbnailServiceTest extends BaseWebScriptTest
 {    
     private NodeRef testRoot;
diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java b/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java
index eaa01085b8..72118c2f9e 100644
--- a/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java
+++ b/source/test-java/org/alfresco/rest/workflow/api/tests/ProcessWorkflowApiTest.java
@@ -47,9 +47,11 @@ import org.alfresco.rest.workflow.api.model.Variable;
 import org.alfresco.rest.workflow.api.tests.WorkflowApiClient.ProcessesClient;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ISO8601DateFormat;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.junit.experimental.categories.Category;
 import org.junit.Test;
 import org.springframework.http.HttpStatus;
 /**
@@ -58,6 +60,7 @@ import org.springframework.http.HttpStatus;
  * @author Tijs Rademakers
  *
  */
+@Category(OwnJVMTestsCategory.class)
 public class ProcessWorkflowApiTest extends EnterpriseWorkflowTestApi
 {   
     @Test
diff --git a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
index 6980eb5d8b..00132e007d 100644
--- a/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
+++ b/source/test-java/org/alfresco/rest/workflow/api/tests/TaskWorkflowApiTest.java
@@ -56,11 +56,13 @@ import org.alfresco.rest.api.tests.client.data.MemberOfSite;
 import org.alfresco.rest.workflow.api.model.ProcessInfo;
 import org.alfresco.rest.workflow.api.tests.WorkflowApiClient.TasksClient;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ISO8601DateFormat;
 import org.apache.commons.lang.StringUtils;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.springframework.http.HttpStatus;
 
 /**
@@ -70,6 +72,7 @@ import org.springframework.http.HttpStatus;
  * @author Frederik Heremans
  *
  */
+@Category(OwnJVMTestsCategory.class)
 public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
 {   
     @Test