diff --git a/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java b/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java
index b46801e676..8d0cbe11bd 100644
--- a/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java
+++ b/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java
@@ -548,6 +548,7 @@ public class AllRepositoryTestsCatalogue
     // [classpath:alfresco/application-context.xml] - part 7
     static void applicationContext_07(TestSuite suite)
     {
+        suite.addTest(new JUnit4TestAdapter(RepositoryStartupTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanSystemTest.class));
         suite.addTest(new JUnit4TestAdapter(org.alfresco.filesys.auth.cifs.CifsAuthenticatorPassthruTest.class));
 
@@ -863,9 +864,9 @@ public class AllRepositoryTestsCatalogue
     }
 
     // [classpath:alfresco/application-context.xml, classpath:cache-test/cache-test-context.xml]
-    static void applicationContext_cacheTestContext_14(TestSuite suite)
+    static void applicationContext_cacheTestContext(TestSuite suite)
     {
-        // this does not want to work in the applicationContext_globalIntegrationTestContext_01 test - unless it is the first test
+        // this does not want to work in the applicationContext_globalIntegrationTestContext test - unless it is the first test
         // pass - fast 6s -
         // cache-test-context.xml should be safe to merge - it defines some beans that seem to be used only in tests
         suite.addTestSuite(org.alfresco.repo.cache.CacheTest.class);
@@ -894,7 +895,7 @@ public class AllRepositoryTestsCatalogue
     }
 
     // [classpath:**/virtualization-test-context.xml, classpath:alfresco/application-context.xml]
-    static void virtualizationTestContext_applicationContext_70(TestSuite suite)
+    static void virtualizationTestContext_applicationContext(TestSuite suite)
     {
 
         // pass - 16s - safe for merge
@@ -902,8 +903,6 @@ public class AllRepositoryTestsCatalogue
         suite.addTest(org.alfresco.repo.virtual.VirtualizationIntegrationTestSuite.suite());
 
     }
-    // TODO until here
-    // ------------------------------------application context until here -------------------
 
     /**
      * 
diff --git a/src/test/java/org/alfresco/Repository001TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext01TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository001TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext01TestSuite.java
index 6c4d732449..2a1ff09ae3 100644
--- a/src/test/java/org/alfresco/Repository001TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext01TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository001TestSuite_ApplicationContext extends TestSuite
+public class AppContext01TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository002TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext02TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository002TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext02TestSuite.java
index e2e2f00cae..250aaa8a40 100644
--- a/src/test/java/org/alfresco/Repository002TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext02TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository002TestSuite_ApplicationContext extends TestSuite
+public class AppContext02TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository003TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext03TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository003TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext03TestSuite.java
index 5d2f7a7188..3a1e2b72de 100644
--- a/src/test/java/org/alfresco/Repository003TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext03TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository003TestSuite_ApplicationContext extends TestSuite
+public class AppContext03TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository004TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext04TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository004TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext04TestSuite.java
index 9a3ded5e6e..66fb1e7ece 100644
--- a/src/test/java/org/alfresco/Repository004TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext04TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository004TestSuite_ApplicationContext extends TestSuite
+public class AppContext04TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository005TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext05TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository005TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext05TestSuite.java
index 05fcf76566..87297f6657 100644
--- a/src/test/java/org/alfresco/Repository005TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext05TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository005TestSuite_ApplicationContext extends TestSuite
+public class AppContext05TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository006TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext06TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository006TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext06TestSuite.java
index 99e9e9cdce..afd3ac81ab 100644
--- a/src/test/java/org/alfresco/Repository006TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext06TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository006TestSuite_ApplicationContext extends TestSuite
+public class AppContext06TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository007TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext07TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository007TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext07TestSuite.java
index d422ef821d..4c0ee9f561 100644
--- a/src/test/java/org/alfresco/Repository007TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext07TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository007TestSuite_ApplicationContext extends TestSuite
+public class AppContext07TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository008TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext08TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository008TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext08TestSuite.java
index 2e56c48131..cfe641b047 100644
--- a/src/test/java/org/alfresco/Repository008TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext08TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository008TestSuite_ApplicationContext extends TestSuite
+public class AppContext08TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository009TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext09TestSuite.java
similarity index 95%
rename from src/test/java/org/alfresco/Repository009TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext09TestSuite.java
index 0561b8b4f9..017e0b1341 100644
--- a/src/test/java/org/alfresco/Repository009TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext09TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository009TestSuite_ApplicationContext
+public class AppContext09TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository010TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext10TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository010TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext10TestSuite.java
index 80f916e8f3..23e4c3e2d6 100644
--- a/src/test/java/org/alfresco/Repository010TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext10TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository010TestSuite_ApplicationContext extends TestSuite
+public class AppContext10TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository011TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext11TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository011TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext11TestSuite.java
index b9e9ee483f..36b1d839d1 100644
--- a/src/test/java/org/alfresco/Repository011TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext11TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository011TestSuite_ApplicationContext extends TestSuite
+public class AppContext11TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository012TestSuite_ApplicationContext.java b/src/test/java/org/alfresco/AppContext12TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository012TestSuite_ApplicationContext.java
rename to src/test/java/org/alfresco/AppContext12TestSuite.java
index 10bd5620f5..39c38cc0fd 100644
--- a/src/test/java/org/alfresco/Repository012TestSuite_ApplicationContext.java
+++ b/src/test/java/org/alfresco/AppContext12TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository012TestSuite_ApplicationContext extends TestSuite
+public class AppContext12TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository100TestSuite_ApplicationContext_Combinations1.java b/src/test/java/org/alfresco/AppContextExtra01TestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository100TestSuite_ApplicationContext_Combinations1.java
rename to src/test/java/org/alfresco/AppContextExtra01TestSuite.java
index 0c87540563..90f97c62b1 100644
--- a/src/test/java/org/alfresco/Repository100TestSuite_ApplicationContext_Combinations1.java
+++ b/src/test/java/org/alfresco/AppContextExtra01TestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository100TestSuite_ApplicationContext_Combinations1 extends TestSuite
+public class AppContextExtra01TestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository101TestSuite_ApplicationContext_Combinations2.java b/src/test/java/org/alfresco/AppContextExtra02TestSuite.java
similarity index 92%
rename from src/test/java/org/alfresco/Repository101TestSuite_ApplicationContext_Combinations2.java
rename to src/test/java/org/alfresco/AppContextExtra02TestSuite.java
index 0ac75c8125..3ce44d983b 100644
--- a/src/test/java/org/alfresco/Repository101TestSuite_ApplicationContext_Combinations2.java
+++ b/src/test/java/org/alfresco/AppContextExtra02TestSuite.java
@@ -28,17 +28,17 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository101TestSuite_ApplicationContext_Combinations2 extends TestSuite
+public class AppContextExtra02TestSuite extends TestSuite
 {
     public static Test suite()
     {
         TestSuite suite = new TestSuite();
         
         //any other order may lead to failing tests
-        AllRepositoryTestsCatalogue.virtualizationTestContext_applicationContext_70(suite);
+        AllRepositoryTestsCatalogue.virtualizationTestContext_applicationContext(suite);
         AllRepositoryTestsCatalogue.applicationContext_testSubscriptionsContext_52(suite);
         AllRepositoryTestsCatalogue.applicationContext_openCmisContext_07(suite);
-        AllRepositoryTestsCatalogue.applicationContext_cacheTestContext_14(suite);
+        AllRepositoryTestsCatalogue.applicationContext_cacheTestContext(suite);
         AllRepositoryTestsCatalogue.applicationContext_mtAllContext_56(suite);
        
         return suite;
diff --git a/src/test/java/org/alfresco/Repository200TestSuite_MinimalContext.java b/src/test/java/org/alfresco/MinContextTestSuite.java
similarity index 94%
rename from src/test/java/org/alfresco/Repository200TestSuite_MinimalContext.java
rename to src/test/java/org/alfresco/MinContextTestSuite.java
index dcd21e5734..76dfb848a4 100644
--- a/src/test/java/org/alfresco/Repository200TestSuite_MinimalContext.java
+++ b/src/test/java/org/alfresco/MinContextTestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository200TestSuite_MinimalContext extends TestSuite
+public class MinContextTestSuite extends TestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository999TestSuite_MiscContexts.java b/src/test/java/org/alfresco/MiscContextTestSuite.java
similarity index 96%
rename from src/test/java/org/alfresco/Repository999TestSuite_MiscContexts.java
rename to src/test/java/org/alfresco/MiscContextTestSuite.java
index 3290eaff0f..762c14c4a5 100644
--- a/src/test/java/org/alfresco/Repository999TestSuite_MiscContexts.java
+++ b/src/test/java/org/alfresco/MiscContextTestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository999TestSuite_MiscContexts
+public class MiscContextTestSuite
 {
     public static Test suite()
     {
diff --git a/src/test/java/org/alfresco/Repository300TestSuite_Transformations.java b/src/test/java/org/alfresco/TransformerTestSuite.java
similarity index 96%
rename from src/test/java/org/alfresco/Repository300TestSuite_Transformations.java
rename to src/test/java/org/alfresco/TransformerTestSuite.java
index d73f462f8c..f6e6dd26c5 100644
--- a/src/test/java/org/alfresco/Repository300TestSuite_Transformations.java
+++ b/src/test/java/org/alfresco/TransformerTestSuite.java
@@ -28,7 +28,7 @@ package org.alfresco;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class Repository300TestSuite_Transformations
+public class TransformerTestSuite
 {
     public static Test suite()
     {