diff --git a/pom.xml b/pom.xml
index a29f42a67f..912763e5b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -995,8 +995,6 @@
                   <configuration>
                        <includes>
                            <include>**/org/alfresco/AllUnitTestsSuite.java</include>
-                           <include>**/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java</include>
-                           <include>**/org/alfresco/repo/model/filefolder/FileFolderLoaderTest.java</include>
                        </includes>
                   </configuration>
                </execution>
diff --git a/source/test-java/org/alfresco/repo/model/ModelTestSuite.java b/source/test-java/org/alfresco/repo/model/ModelTestSuite.java
index 390d82f1a4..e4cf822c71 100644
--- a/source/test-java/org/alfresco/repo/model/ModelTestSuite.java
+++ b/source/test-java/org/alfresco/repo/model/ModelTestSuite.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.model;
 
 import org.alfresco.repo.model.filefolder.FileFolderDuplicateChildTest;
 import org.alfresco.repo.model.filefolder.FileFolderLoaderTest;
+import org.alfresco.repo.model.filefolder.FileFolderPerformanceTester;
 import org.alfresco.repo.model.filefolder.FileFolderServiceImplTest;
 import org.alfresco.repo.model.filefolder.FileFolderServicePropagationTest;
 import org.alfresco.repo.model.filefolder.HiddenAspectTest;
@@ -49,11 +50,13 @@ import org.junit.runners.Suite.SuiteClasses;
     
 	HiddenAspectTest.class,
 	
+    FileFolderLoaderTest.class,
+    FileFolderPerformanceTester.class,
+    
     // Add the file folder tests
     // These need to come afterwards, as they insert extra
     //  interceptors which would otherwise confuse things
     FileFolderServiceImplTest.class,
-    FileFolderLoaderTest.class,
     FileFolderDuplicateChildTest.class,
     FileFolderServicePropagationTest.class
 })