diff --git a/pom.xml b/pom.xml
index 45c26e8605..37a8d6ed5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -882,6 +882,7 @@
                                  <goals>
                                      <goal>test</goal>
                                  </goals>
+                                 <phase>process-test-classes</phase>
                                  <configuration>
                                      <groups>org.alfresco.test_category.BaseSpringTestsCategory</groups>
                                      <testFailureIgnore>true</testFailureIgnore>
diff --git a/source/test-java/org/alfresco/filesys/FTPServerTest.java b/source/test-java/org/alfresco/filesys/FTPServerTest.java
index c62998e704..5f197755f3 100644
--- a/source/test-java/org/alfresco/filesys/FTPServerTest.java
+++ b/source/test-java/org/alfresco/filesys/FTPServerTest.java
@@ -44,7 +44,7 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.PropertyMap;
 import org.apache.commons.logging.Log;
@@ -63,7 +63,7 @@ import org.springframework.context.ApplicationContext;
  * Uses the commons-net ftp client library to connect to the
  * Alfresco FTP server.
  */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class FTPServerTest extends TestCase
 
 {
diff --git a/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java b/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
index e137db4378..cdcd1a3741 100644
--- a/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
+++ b/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java
@@ -91,7 +91,7 @@ import org.alfresco.service.cmr.security.PersonService;
 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.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
@@ -103,7 +103,7 @@ import org.springframework.core.io.ClassPathResource;
 /**
  * Unit tests for Alfresco Repository ContentDiskDriver
  */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ContentDiskDriverTest extends TestCase
 {
     private static final String TEST_PROTOTYPE_NAME = "test";
diff --git a/source/test-java/org/alfresco/jcr/item/Alf1791Test.java b/source/test-java/org/alfresco/jcr/item/Alf1791Test.java
index 57fdf6de0c..7e5ee2b541 100644
--- a/source/test-java/org/alfresco/jcr/item/Alf1791Test.java
+++ b/source/test-java/org/alfresco/jcr/item/Alf1791Test.java
@@ -7,7 +7,10 @@ import javax.jcr.SimpleCredentials;
 import javax.jcr.nodetype.NodeType;
 
 import org.alfresco.jcr.test.BaseJCRTest;
+import org.alfresco.test_category.LegacyCategory;
+import org.junit.experimental.categories.Category;
 
+@Category(LegacyCategory.class)
 public class Alf1791Test extends BaseJCRTest
 {
 
diff --git a/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java b/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java
index 5349114ab8..aea7275e43 100644
--- a/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java
@@ -39,6 +39,7 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
@@ -50,7 +51,7 @@ import org.junit.experimental.categories.Category;
  * 
  * @author Jesper Steen Møller
  */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ContentMetadataExtracterTest extends BaseSpringTest
 {
     protected static final String QUICK_TITLE = "The quick brown fox jumps over the lazy dog";
diff --git a/source/test-java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java b/source/test-java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java
index 771b7a112e..0a66abf460 100644
--- a/source/test-java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java
+++ b/source/test-java/org/alfresco/repo/bulkimport/impl/BulkImportTest.java
@@ -53,6 +53,7 @@ import org.alfresco.service.cmr.rule.Rule;
 import org.alfresco.service.cmr.rule.RuleType;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionHistory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -63,7 +64,7 @@ import org.springframework.util.ResourceUtils;
 /**
  * @since 4.0
  */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class BulkImportTest extends AbstractBulkImportTests
 {
     private StreamingNodeImporterFactory streamingNodeImporterFactory;
diff --git a/source/test-java/org/alfresco/repo/cache/CacheTest.java b/source/test-java/org/alfresco/repo/cache/CacheTest.java
index fdaeabdacf..91ff2fce30 100644
--- a/source/test-java/org/alfresco/repo/cache/CacheTest.java
+++ b/source/test-java/org/alfresco/repo/cache/CacheTest.java
@@ -33,6 +33,7 @@ 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.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.apache.commons.lang.mutable.MutableLong;
@@ -44,7 +45,7 @@ import org.springframework.context.ApplicationContext;
  * 
  * @author Derek Hulley 
  */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class CacheTest extends TestCase
 {
     private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(
diff --git a/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java b/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
index e871eafa21..da3a303dbe 100644
--- a/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
+++ b/source/test-java/org/alfresco/repo/dictionary/types/period/PeriodTest.java
@@ -28,6 +28,7 @@ import junit.framework.TestCase;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.Period;
 import org.alfresco.service.cmr.repository.PeriodProvider;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.CachingDateFormat;
@@ -41,7 +42,7 @@ import org.junit.runners.MethodSorters;
  * @author andyh
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class PeriodTest extends TestCase
 {
 
diff --git a/source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java b/source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
index bfe6bf2b0e..cb81c70392 100644
--- a/source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
+++ b/source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
@@ -34,7 +34,7 @@ import org.alfresco.repo.solr.AclChangeSet;
 import org.alfresco.repo.solr.NodeParameters;
 import org.alfresco.repo.solr.Transaction;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.junit.experimental.categories.Category;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -44,7 +44,7 @@ import org.springframework.context.ConfigurableApplicationContext;
  *
  * @since 4.0
  */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class SOLRDAOTest extends TestCase
 {
     private ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) 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 80382c6de5..2e0606d9d6 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.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.test.junitrules.AlfrescoPerson;
 import org.alfresco.util.test.junitrules.ApplicationContextInit;
@@ -68,7 +69,7 @@ import org.junit.rules.RuleChain;
  *
  * @author Alex Miller
  */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class DownloadServiceIntegrationTest 
 {
     public static final long MAX_TIME = 5000;
diff --git a/source/test-java/org/alfresco/repo/exporter/ExporterComponentTest.java b/source/test-java/org/alfresco/repo/exporter/ExporterComponentTest.java
index 5531de0210..1d63b4a9dd 100644
--- a/source/test-java/org/alfresco/repo/exporter/ExporterComponentTest.java
+++ b/source/test-java/org/alfresco/repo/exporter/ExporterComponentTest.java
@@ -57,6 +57,7 @@ import org.alfresco.service.cmr.view.ImporterService;
 import org.alfresco.service.cmr.view.Location;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.TempFileProvider;
@@ -64,7 +65,7 @@ import org.alfresco.util.debug.NodeStoreInspector;
 import org.junit.experimental.categories.Category;
 import org.springframework.extensions.surf.util.I18NUtil;
 
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ExporterComponentTest extends BaseSpringTest
 {
 
diff --git a/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java b/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java
index d0ae9b39ba..7139e14571 100644
--- a/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java
+++ b/source/test-java/org/alfresco/repo/importer/ImporterComponentTest.java
@@ -36,20 +36,20 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.cmr.version.VersionHistory;
 import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.service.cmr.view.ImporterBinding.UUID_BINDING;
 import org.alfresco.service.cmr.view.ImporterService;
 import org.alfresco.service.cmr.view.Location;
-import org.alfresco.service.cmr.view.ImporterBinding.UUID_BINDING;
 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.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.debug.NodeStoreInspector;
-import org.junit.experimental.categories.Category;
 import org.joda.time.DateTimeZone;
+import org.junit.experimental.categories.Category;
 import org.springframework.extensions.surf.util.ISO8601DateFormat;
 
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ImporterComponentTest extends BaseSpringTest
 {
     private ImporterService importerService;
diff --git a/source/test-java/org/alfresco/repo/jscript/ScriptBehaviourTest.java b/source/test-java/org/alfresco/repo/jscript/ScriptBehaviourTest.java
index 59ac165311..dcbc95b27f 100644
--- a/source/test-java/org/alfresco/repo/jscript/ScriptBehaviourTest.java
+++ b/source/test-java/org/alfresco/repo/jscript/ScriptBehaviourTest.java
@@ -35,6 +35,7 @@ import org.alfresco.service.cmr.repository.ScriptLocation;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.junit.experimental.categories.Category;
@@ -44,7 +45,7 @@ import org.junit.experimental.categories.Category;
  * 
  * @author Roy Wetherall
  */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ScriptBehaviourTest extends BaseSpringTest 
 {
 	private ServiceRegistry serviceRegistry;
diff --git a/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java b/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java
index 852d089359..9b268f31dd 100644
--- a/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java
+++ b/source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java
@@ -27,6 +27,7 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.junit.experimental.categories.Category;
@@ -43,7 +44,7 @@ import org.springframework.context.ApplicationContext;
  * @since 3.2
  */
 @SuppressWarnings("unused")
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class JobLockServiceTest extends TestCase
 {
     public static final String NAMESPACE = "http://www.alfresco.org/test/JobLockServiceTest";
diff --git a/source/test-java/org/alfresco/repo/lock/LockServiceImplTest.java b/source/test-java/org/alfresco/repo/lock/LockServiceImplTest.java
index 4b7ce79214..e666711df5 100644
--- a/source/test-java/org/alfresco/repo/lock/LockServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/lock/LockServiceImplTest.java
@@ -47,6 +47,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.security.MutableAuthenticationService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.TestWithUserUtils;
@@ -58,7 +59,7 @@ import org.junit.experimental.categories.Category;
  * 
  * @author Roy Wetherall
  */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class LockServiceImplTest extends BaseSpringTest
 {
     /**