diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
index 2c939d09ec..21fb272739 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
 @RunWith(ClasspathSuite.class)
 @SuiteTypes({SuiteType.TEST_CLASSES, SuiteType.RUN_WITH_CLASSES, SuiteType.JUNIT38_TEST_CLASSES})
 @ClassnameFilters({
-    // Execute all tests classes ending with "Test"
+    // Execute all test classes ending with "Test"
     ".*Test",
     // Exclude the ones ending with "UnitTest"
     "!.*UnitTest",
@@ -47,7 +47,9 @@ import org.junit.runner.RunWith;
     "!.*NotificationServiceHelperSystemTest",
     "!.*RetryingTransactionHelperBaseTest",
     "!.*RMCaveatConfigServiceImplTest",
-    // This test is running successfully locally but not on bamboo
+    // This test is running successfully locally but not on bamboo (if executed as a single test).
+    // The problem can be reproduced if the whole test suite is run locally as well.
+    // Tests should not be dependant on other test classes and should run in any order without any problems.
     "!.*EmailMapScriptTest"
 })
 public class AllTestSuite
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/AllUnitTestSuite.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/AllUnitTestSuite.java
index c2b437ab0f..3ae6668dad 100644
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/AllUnitTestSuite.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/AllUnitTestSuite.java
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
  */
 @RunWith(ClasspathSuite.class)
 @ClassnameFilters({
-    // Execute all tests classes ending with "UnitTest"
+    // Execute all test classes ending with "UnitTest"
     ".*UnitTest",
     // Put the test classes you want to exclude here
     "!.*FilePlanPermissionServiceImplUnitTest"