diff --git a/pom.xml b/pom.xml
index deec09319e..2a767c1ca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
         <artifactId>alfresco-parent</artifactId>
         <groupId>org.alfresco</groupId>
         <version>4.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../pom-experimental.xml</relativePath>
     </parent>
 
     <dependencies>
@@ -631,29 +631,34 @@
                         <exclude>**/org/alfresco/repo/model/filefolder/HiddenAspectTest.*</exclude>
                         <exclude>**/org/alfresco/repo/publishing/PublishEventActionTest.*</exclude>
                         <exclude>**/org/alfresco/repo/rule/BaseRuleTest.*</exclude>
+                        <exclude>**/org/alfresco/repo/workflow/activiti/AbstractActivitiComponentTest.*</exclude>
+                        <exclude>**/org/alfresco/repo/workflow/activiti/ActivitiSmokeTest.*</exclude>
+                        <exclude>**/org/alfresco/repo/workflow/activiti/ActivitiSpringTest.*</exclude>
+                        <exclude>**/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.*</exclude>
+                        <exclude>**/org/alfresco/repo/workflow/activiti/ActivitiWorkflowComponentTest.*</exclude>
+                        <exclude>**/org/alfresco/repo/workflow/jbpm/JbpmTimerTest.*</exclude>
 
                         <!-- TODO tests which pass with Ant, but not here. To investigate -->
                         <exclude>**/org/alfresco/RepositoryStartStopTest.*</exclude>
                         <exclude>**/org/alfresco/cmis/changelog/CMISChangeLogServiceTest.*</exclude>
                         <exclude>**/org/alfresco/cmis/renditions/CMISRenditionServiceTest.*</exclude>
-                        <exclude>**/org/alfresco/repo/avm/AVMCrawlTestP.*</exclude>
-                        <exclude>**/org/alfresco/repo/avm/AVMScaleTestP.*</exclude>
-                        <exclude>**/org/alfresco/repo/avm/AVMStressTestP.*</exclude>
-                        <exclude>**/org/alfresco/repo/avm/PurgeTestP.*</exclude>
-                        <exclude>**/org/alfresco/repo/avm/AVMServiceLocalTest.*</exclude>
                         <exclude>**/org/alfresco/repo/avm/AVMServiceTest.*</exclude>
-                        <exclude>**/org/alfresco/repo/avm/locking/AVMLockingServiceTest.*</exclude>
                         <exclude>**/org/alfresco/repo/blog/BlogServiceImplTest.*</exclude>
                         <exclude>**/org/alfresco/repo/deploy/DeploymentServiceImplFSTest.*</exclude>
                         <exclude>**/org/alfresco/repo/deploy/DeploymentServiceTest.*</exclude>
-                        <exclude>**/org/alfresco/repo/node/NodeServiceTest.*</exclude>
+                        <exclude>**/org/alfresco/repo/node/NodeServiceTest.*</exclude> <!-- Never ending -->
                         <exclude>**/org/alfresco/repo/rendition/MultiUserRenditionTest.*</exclude>
                         <exclude>**/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.*</exclude>
                         <exclude>**/org/alfresco/repo/rendition/RenditionServicePermissionsTest.*</exclude>
+                        <exclude>**/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.*</exclude> <!-- Never ending -->
+                        <exclude>**/org/alfresco/repo/transfer/TransferServiceImplTest.*</exclude> <!-- Never ending -->
+                        <exclude>**/org/alfresco/repo/version/NodeServiceImplTest.*</exclude>
+                        <exclude>**/org/alfresco/wcm/**</exclude>
 
                         <!-- Test failing because we run on a EC2 machine... To be unleashed soon -->
                         <exclude>**/org/alfresco/filesys/FTPServerTest.*</exclude>
                         <exclude>**/org/alfresco/repo/content/AbstractContentReaderLimitTest.*</exclude>
+                        <exclude>**/org/alfresco/repo/node/PerformanceNodeServiceTest.*</exclude>
                     </excludes>
                 </configuration>
             </plugin>
diff --git a/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java b/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
index 95718e4d1e..f0fd010eb6 100644
--- a/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
+++ b/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
@@ -38,7 +38,7 @@ public class AVMCrawlTestP extends AVMServiceTestBase
     public void xtestCrawlA()
     {
         testCrawl(1,
-                  "source/java/org/alfresco/repo/avm/actions", // relative from .../repository
+                  getSourceFolder() + "/org/alfresco/repo/avm/actions", // relative from .../repository
                   1,
                   30000); // 30 secs
     }
@@ -47,7 +47,7 @@ public class AVMCrawlTestP extends AVMServiceTestBase
     public void testCrawlB()
     {
         testCrawl(2,
-                  "source/java/org/alfresco/repo/avm/actions", // relative from .../repository
+                  getSourceFolder() + "/org/alfresco/repo/avm/actions", // relative from .../repository
                   2,
                   30000); // 30 secs
     }
@@ -56,7 +56,7 @@ public class AVMCrawlTestP extends AVMServiceTestBase
     public void xtestCrawlC()
     {
         testCrawl(10,
-                  "source/java/org/alfresco/repo/avm", // relative from .../repository
+                  getSourceFolder() + "/org/alfresco/repo/avm", // relative from .../repository
                   2,
                   60000); // 1 min
     }
diff --git a/source/java/org/alfresco/repo/avm/AVMScaleTestP.java b/source/java/org/alfresco/repo/avm/AVMScaleTestP.java
index c0348c970f..542eb39a87 100644
--- a/source/java/org/alfresco/repo/avm/AVMScaleTestP.java
+++ b/source/java/org/alfresco/repo/avm/AVMScaleTestP.java
@@ -31,14 +31,14 @@ public class AVMScaleTestP extends AVMServiceTestBase
     public void testScaleA()
     {
         testScaling(1,
-                    "source/java/org/alfresco/repo/avm/actions", // relative from .../repository
+                    getSourceFolder() + "/org/alfresco/repo/avm/actions", // relative from .../repository
                     1);
     }
     
     public void testScaleB()
     {
         testScaling(2,
-                    "source/java/org/alfresco/repo/avm", // relative from .../repository
+                    getSourceFolder() + "/org/alfresco/repo/avm", // relative from .../repository
                     2);
     }
 
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
index 971d2469e7..d6de23fb2c 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
@@ -1043,7 +1043,8 @@ public class AVMServiceLocalTest extends TestCase
     public void testBulkUpdateLD() throws Exception
     {
         //String LOAD_DIR = "config/alfresco/bootstrap";
-        String LOAD_DIR = "source/java/org/alfresco/repo/avm/actions";
+        String LOAD_DIR = System.getProperty("alfresco.java.sources.dir", "source/java") +
+            "/org/alfresco/repo/avm/actions";
         
         String[] split = LOAD_DIR.split("/");
         String DIR = split[split.length-1];
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index 5d1b7b1e64..6a00220c27 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -540,7 +540,7 @@ public class AVMServiceTest extends AVMServiceTestBase
             
             assertEquals(1, fService.getStoreVersions("main").size());
             
-            loader.recursiveLoad("source/java/org/alfresco/repo/avm/actions", "main:/");
+            loader.recursiveLoad(getSourceFolder()+"/org/alfresco/repo/avm/actions", "main:/");
             
             long time = System.currentTimeMillis();
             times.add(time);
@@ -548,7 +548,7 @@ public class AVMServiceTest extends AVMServiceTestBase
             
             assertEquals(1, fService.createSnapshot("main", null, null).get("main").intValue());
             
-            loader.recursiveLoad("source/java/org/alfresco/repo/avm/ibatis", "main:/");
+            loader.recursiveLoad(getSourceFolder()+"/org/alfresco/repo/avm/ibatis", "main:/");
             
             time = System.currentTimeMillis();
             times.add(time);
@@ -556,7 +556,7 @@ public class AVMServiceTest extends AVMServiceTestBase
             
             assertEquals(2, fService.createSnapshot("main", null, null).get("main").intValue());
             
-            loader.recursiveLoad("source/java/org/alfresco/repo/avm/locking", "main:/");
+            loader.recursiveLoad(getSourceFolder()+"/org/alfresco/repo/avm/locking", "main:/");
             
             time = System.currentTimeMillis();
             times.add(time);
@@ -990,7 +990,7 @@ public class AVMServiceTest extends AVMServiceTestBase
                 {
                     BulkLoader loader = new BulkLoader();
                     loader.setAvmService(fService);
-                    loader.recursiveLoad("source/java/org/alfresco/repo/avm", "source:/");
+                    loader.recursiveLoad(getSourceFolder()+"/org/alfresco/repo/avm", "source:/");
                     return null;
                 }
             };
@@ -2744,8 +2744,8 @@ public class AVMServiceTest extends AVMServiceTestBase
         //String LOAD_DIR1 = "config/alfresco/bootstrap";
         //String LOAD_DIR2 = "config/alfresco/extension";
         
-        String LOAD_DIR1 = "source/java/org/alfresco/repo/avm/actions";
-        String LOAD_DIR2 = "source/java/org/alfresco/repo/avm/ibatis";
+        String LOAD_DIR1 = getSourceFolder()+"/org/alfresco/repo/avm/actions";
+        String LOAD_DIR2 = getSourceFolder()+"/org/alfresco/repo/avm/ibatis";
         
         String[] split1 = LOAD_DIR1.split("/");
         String DIR1 = split1[split1.length-1];
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
index 17d61b27b3..ae99fcdc00 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
@@ -572,4 +572,9 @@ public class AVMServiceTestBase extends TestCase
         int latest = fService.getNextVersionID(repName);
         history.put(latest - 1, recursiveList(repName, -1, false));
     }
+
+    protected String getSourceFolder()
+    {
+        return System.getProperty("alfresco.java.sources.dir", "source/java");
+    }
 }
diff --git a/source/java/org/alfresco/repo/avm/AVMStressTestP.java b/source/java/org/alfresco/repo/avm/AVMStressTestP.java
index b890ba887c..841ba31814 100644
--- a/source/java/org/alfresco/repo/avm/AVMStressTestP.java
+++ b/source/java/org/alfresco/repo/avm/AVMStressTestP.java
@@ -33,7 +33,7 @@ public class AVMStressTestP extends AVMServiceTestBase
     public void xtestStressA() throws Throwable
     {
         testNThreads(   1,  // nThreads
-                        "source/java/org/alfresco/repo/avm/actions", // relative dir to load from (.../repository)
+                        getSourceFolder() + "/org/alfresco/repo/avm/actions", // relative dir to load from (.../repository)
                         1,  // nCopies
                         1,  // create file
                         1,  // create dir
@@ -51,7 +51,7 @@ public class AVMStressTestP extends AVMServiceTestBase
     public void testStressB() throws Throwable
     {
         testNThreads(   2,  // nThreads
-                        "source/java/org/alfresco/repo/avm/actions", // relative dir to load from (.../repository)
+                        getSourceFolder() + "/org/alfresco/repo/avm/actions", // relative dir to load from (.../repository)
                         1,  // nCopies
                         10,  // create file
                         2,  // create dir
diff --git a/source/java/org/alfresco/repo/avm/PurgeTestP.java b/source/java/org/alfresco/repo/avm/PurgeTestP.java
index 271473575b..e7ab110827 100644
--- a/source/java/org/alfresco/repo/avm/PurgeTestP.java
+++ b/source/java/org/alfresco/repo/avm/PurgeTestP.java
@@ -86,7 +86,7 @@ public class PurgeTestP extends AVMServiceTestBase
             
             
             //loader.recursiveLoad("source/web", "main:/");
-            loader.recursiveLoad("source/java/org/alfresco/repo/avm", "main:/");
+            loader.recursiveLoad(getSourceFolder() + "/org/alfresco/repo/avm", "main:/");
             
             
             logger.info("Load time: " + (System.currentTimeMillis() - start) + "ms");
@@ -119,7 +119,7 @@ public class PurgeTestP extends AVMServiceTestBase
             
             
             //loader.recursiveLoad("source", "main:/");
-            loader.recursiveLoad("source/java/org/alfresco/repo/avm", "main:/");
+            loader.recursiveLoad(getSourceFolder() + "/org/alfresco/repo/avm", "main:/");
             
             
             logger.info("Load time: " + (System.currentTimeMillis() - start) + "ms");
@@ -160,7 +160,7 @@ public class PurgeTestP extends AVMServiceTestBase
             
             
             //loader.recursiveLoad("source", "main:/");
-            loader.recursiveLoad("source/java/org/alfresco/repo/avm", "main:/");
+            loader.recursiveLoad(getSourceFolder() + "/org/alfresco/repo/avm", "main:/");
             
             
             logger.info("Load time: " + (System.currentTimeMillis() - start) + "ms");
diff --git a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java
index 7ca331a82a..93088b0176 100644
--- a/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/locking/AVMLockingServiceTest.java
@@ -316,7 +316,9 @@ public class AVMLockingServiceTest extends TestCase
                 {
                     BulkLoader loader = new BulkLoader();
                     loader.setAvmService(avmService);
-                    loader.recursiveLoad("source/java/org/alfresco/repo/avm", "main--admin:/");
+                    loader.recursiveLoad(
+                        System.getProperty("alfresco.java.sources.dir", "source/java") + "/org/alfresco/repo/avm",
+                        "main--admin:/");
                     return null;
                 }
             };