diff --git a/source/test-java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java b/source/test-java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java
index 0d669d0146..08610dc829 100644
--- a/source/test-java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java
@@ -25,14 +25,17 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
+import org.junit.experimental.categories.Category;
 
 /**
  * Remove features action execution test
  * 
  * @author Roy Wetherall
  */
+@Category(OwnJVMTestsCategory.class)
 public class RemoveFeaturesActionExecuterTest extends BaseSpringTest
 {
     /**
diff --git a/source/test-java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java b/source/test-java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java
index feccc3b7fb..30d2b6c62f 100644
--- a/source/test-java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java
@@ -25,14 +25,17 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
+import org.junit.experimental.categories.Category;
 
 /**
  * Is sub class evaluator test
  * 
  * @author Roy Wetherall
  */
+@Category(OwnJVMTestsCategory.class)
 public class SetPropertyValueActionExecuterTest extends BaseSpringTest
 {
     private NodeService nodeService;
diff --git a/source/test-java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java b/source/test-java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java
index eb27c7beea..98c05d11a1 100644
--- a/source/test-java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java
@@ -22,14 +22,17 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
+import org.junit.experimental.categories.Category;
 
 /**
  * Specialise type action execution test
  * 
  * @author Roy Wetherall
  */
+@Category(OwnJVMTestsCategory.class)
 public class SpecialiseTypeActionExecuterTest extends BaseAlfrescoSpringTest
 {    
     /**
diff --git a/source/test-java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java b/source/test-java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java
index ad8e2ed275..6c2d3f9f95 100644
--- a/source/test-java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java
@@ -28,14 +28,17 @@ import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
+import org.junit.experimental.categories.Category;
 
 /**
  * Transition simple workflow action executer unit test
  * 
  * @author Roy Wetherall
  */
+@Category(OwnJVMTestsCategory.class)
 public class TransitionSimpleWorkflowActionExecuterTest extends BaseAlfrescoSpringTest
 {    
     private FileFolderService fileFolderService;
diff --git a/source/test-java/org/alfresco/repo/cache/CacheTest.java b/source/test-java/org/alfresco/repo/cache/CacheTest.java
index 64401a98e9..fdaeabdacf 100644
--- a/source/test-java/org/alfresco/repo/cache/CacheTest.java
+++ b/source/test-java/org/alfresco/repo/cache/CacheTest.java
@@ -33,8 +33,10 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
 import org.alfresco.repo.transaction.TransactionListenerAdapter;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.apache.commons.lang.mutable.MutableLong;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 
 /**
@@ -42,6 +44,7 @@ import org.springframework.context.ApplicationContext;
  * 
  * @author Derek Hulley 
  */
+@Category(OwnJVMTestsCategory.class)
 public class CacheTest extends TestCase
 {
     private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(
diff --git a/source/test-java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java b/source/test-java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
index 56de69f18d..80382c6de5 100644
--- a/source/test-java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/download/DownloadServiceIntegrationTest.java
@@ -48,6 +48,7 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.test.junitrules.AlfrescoPerson;
 import org.alfresco.util.test.junitrules.ApplicationContextInit;
 import org.alfresco.util.test.junitrules.TemporaryNodes;
@@ -59,6 +60,7 @@ import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.rules.RuleChain;
 
 /**
@@ -66,6 +68,7 @@ import org.junit.rules.RuleChain;
  *
  * @author Alex Miller
  */
+@Category(OwnJVMTestsCategory.class)
 public class DownloadServiceIntegrationTest 
 {
     public static final long MAX_TIME = 5000;
diff --git a/source/test-java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java b/source/test-java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java
index 3e29998c6f..a1d6a7476a 100644
--- a/source/test-java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java
+++ b/source/test-java/org/alfresco/repo/forms/processor/action/ActionFormProcessorTest.java
@@ -55,11 +55,13 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ApplicationContext;
 
 /**
@@ -68,6 +70,7 @@ import org.springframework.context.ApplicationContext;
  * @author Neil Mc Erlean
  * @since 4.0
  */
+@Category(OwnJVMTestsCategory.class)
 public class ActionFormProcessorTest
 {
     private static final ApplicationContext testContext = ApplicationContextHelper.getApplicationContext();
diff --git a/source/test-java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java b/source/test-java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
index 2a497eda66..90dab8c8a4 100644
--- a/source/test-java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
@@ -80,8 +80,10 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.Pair;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -90,6 +92,7 @@ import org.springframework.context.ConfigurableApplicationContext;
  * @since 3.3
  */
 @SuppressWarnings("deprecation")
+@Category(OwnJVMTestsCategory.class)
 public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
 {
     private static final String WHITE = "ffffff";
diff --git a/source/test-java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java b/source/test-java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java
index e9da27d6e8..06b9383a02 100644
--- a/source/test-java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java
+++ b/source/test-java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java
@@ -36,10 +36,12 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.experimental.categories.Category;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
@@ -47,6 +49,7 @@ import org.w3c.dom.NodeList;
  * @author Brian
  *
  */
+@Category(OwnJVMTestsCategory.class)
 public class XSLTFunctionsTest extends BaseAlfrescoSpringTest
 {
     private final static Log log = LogFactory.getLog(XSLTFunctionsTest.class);
diff --git a/source/test-java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java b/source/test-java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
index 2513369ef8..f209825c95 100644
--- a/source/test-java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
+++ b/source/test-java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
@@ -38,16 +38,19 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.TemplateProcessor;
 import org.alfresco.service.cmr.repository.TemplateService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.custommonkey.xmlunit.Diff;
+import org.junit.experimental.categories.Category;
 
 /**
  * @author Brian
  * 
  */
+@Category(OwnJVMTestsCategory.class)
 public class XSLTRenderingEngineTest extends BaseAlfrescoSpringTest
 {
     private final static Log log = LogFactory.getLog(XSLTRenderingEngineTest.class);
diff --git a/source/test-java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java b/source/test-java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
index bd5e362299..1401f21036 100644
--- a/source/test-java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
@@ -73,9 +73,11 @@ import org.alfresco.service.cmr.transfer.TransferTarget;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.GUID;
 import org.alfresco.util.Pair;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -84,6 +86,7 @@ import org.springframework.context.ConfigurableApplicationContext;
  *  to run async actions and know how they'll behave
  * @author Nick Burch
  */
+@Category(OwnJVMTestsCategory.class)
 public class ReplicationServiceIntegrationTest extends TestCase
 {
    private static ConfigurableApplicationContext ctx = 
diff --git a/source/test-java/org/alfresco/repo/version/NodeServiceImplTest.java b/source/test-java/org/alfresco/repo/version/NodeServiceImplTest.java
index a0f4ec2c5b..b23865c3b1 100644
--- a/source/test-java/org/alfresco/repo/version/NodeServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/version/NodeServiceImplTest.java
@@ -42,15 +42,18 @@ import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.GUID;
 import org.alfresco.util.TestWithUserUtils;
 import org.alfresco.util.debug.NodeStoreInspector;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.experimental.categories.Category;
 
 /**
  * @author Roy Wetherall
  */
+@Category(OwnJVMTestsCategory.class)
 public class NodeServiceImplTest extends BaseVersionStoreTest 
 {
     private static Log logger = LogFactory.getLog(NodeServiceImplTest.class);