diff --git a/pom.xml b/pom.xml
index 7bf7310078..6cc3bb80ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -883,6 +883,7 @@
                                  <goals>
                                      <goal>test</goal>
                                  </goals>
+                                 <phase>process-test-classes</phase>
                                  <configuration>
                                      <!-- These are the default fork options -->
                                      <forkCount>1</forkCount>
@@ -932,7 +933,7 @@
 
                         <!-- Default configuration, specifying which tests to pass -->
                         <configuration>
-<!--                             <argLine>-Xmx1280m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine> -->
+                            <argLine>-Xmx2560m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
                             <includes>
                                 <!-- Standard test names -->
                                 <include>**/*Test.*</include>
diff --git a/source/test-java/org/alfresco/repo/workflow/jbpm/JbpmMultitenantWorkflowTest.java b/source/test-java/org/alfresco/repo/workflow/jbpm/JbpmMultitenantWorkflowTest.java
index b195516e9e..d05756b0f5 100644
--- a/source/test-java/org/alfresco/repo/workflow/jbpm/JbpmMultitenantWorkflowTest.java
+++ b/source/test-java/org/alfresco/repo/workflow/jbpm/JbpmMultitenantWorkflowTest.java
@@ -20,12 +20,15 @@
 package org.alfresco.repo.workflow.jbpm;
 
 import org.alfresco.repo.workflow.AbstractMultitenantWorkflowTest;
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.junit.experimental.categories.Category;
 
 /**
  * @author Nick Smith
  * @since 4.0
  *
  */
+@Category(OwnJVMTestsCategory.class)
 public class JbpmMultitenantWorkflowTest extends AbstractMultitenantWorkflowTest
 {
     @Override
diff --git a/source/test-java/org/alfresco/repo/workflow/jbpm/JbpmWorkflowServiceIntegrationTest.java b/source/test-java/org/alfresco/repo/workflow/jbpm/JbpmWorkflowServiceIntegrationTest.java
index 97d4eef5cc..5d4fb41e2d 100644
--- a/source/test-java/org/alfresco/repo/workflow/jbpm/JbpmWorkflowServiceIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/workflow/jbpm/JbpmWorkflowServiceIntegrationTest.java
@@ -33,6 +33,8 @@ import org.alfresco.service.cmr.workflow.WorkflowTask;
 import org.alfresco.service.cmr.workflow.WorkflowTaskState;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.junit.experimental.categories.Category;
 
 /**
  * JBPM Workflow Service Implementation Tests
@@ -40,6 +42,7 @@ import org.alfresco.service.namespace.QName;
  * @author Nick Smith
  * @since 3.4.e
  */
+@Category(OwnJVMTestsCategory.class)
 public class JbpmWorkflowServiceIntegrationTest extends AbstractWorkflowServiceIntegrationTest
 {