diff --git a/pom.xml b/pom.xml
index 555e4d1dd4..172db6d279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -877,7 +877,6 @@
                                 </configuration>
                             </execution>
                              <!-- Execution for tests which use BaseSpring test -->
-                             <!--
                             <execution>
                                  <id>base-spring-troublesome-tests</id>
                                  <goals>
@@ -888,7 +887,6 @@
                                      <testFailureIgnore>true</testFailureIgnore>
                                  </configuration>
                             </execution>
-                            -->
                             <!-- Execution for tests which require their own JVM -->
                             <execution>
                                  <id>run-ownJVMTestsCategory</id>
@@ -905,11 +903,10 @@
                                  <id>default-test</id>
                                  <configuration>
                                      <argLine>-Xmx3G -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
-                                     <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory</excludedGroups>
+                                     <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory, org.alfresco.test_category.BaseSpringTestsCategory,org.alfresco.test_category.LegacyCategory</excludedGroups>                         
                                      <testFailureIgnore>true</testFailureIgnore>
                                  </configuration>
                              </execution>
-                            <!--
                              <execution>
                                  <id>run-legacy-tests</id>
                                  <goals>
@@ -919,7 +916,6 @@
                                      <groups>org.alfresco.test_category.LegacyCategory</groups>
                                  </configuration>
                             </execution>
-                            -->
                         </executions>
 
                         <!-- Default configuration, specifying which tests to pass -->
diff --git a/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java b/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java
index a3a43608ab..ed4b762998 100644
--- a/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java
@@ -22,7 +22,7 @@ package org.alfresco.repo.publishing;
 import java.util.List;
 
 import org.alfresco.service.cmr.workflow.WorkflowPath;
-import org.alfresco.test_category.BaseSpringTestsCategory;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.junit.experimental.categories.Category;
 
 
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
  * @author Frederik Heremans
  * @since 4.0
  */
-@Category(BaseSpringTestsCategory.class)
+@Category(OwnJVMTestsCategory.class)
 public class PublishWebContentActivitiTest extends PublishWebContentProcessTest
 {
     private static final String DEF_NAME = "activiti$publishWebContent";
diff --git a/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java b/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java
index 3ac659311b..c8d3f32543 100644
--- a/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java
@@ -19,7 +19,7 @@
 
 package org.alfresco.repo.publishing;
 
-import org.alfresco.test_category.BaseSpringTestsCategory;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.junit.experimental.categories.Category;
 
 
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
  * @author Frederik Heremans
  * @since 4.0
  */
-@Category(BaseSpringTestsCategory.class)
+@Category(OwnJVMTestsCategory.class)
 public class PublishWebContentJbpmTest extends PublishWebContentProcessTest
 {
     private static final String DEF_NAME = "jbpm$publishWebContent";