diff --git a/repository/src/test/java/org/alfresco/AppContext04TestSuite.java b/repository/src/test/java/org/alfresco/AppContext04TestSuite.java
index 6c52a12a9c3..20695c33ece 100644
--- a/repository/src/test/java/org/alfresco/AppContext04TestSuite.java
+++ b/repository/src/test/java/org/alfresco/AppContext04TestSuite.java
@@ -39,60 +39,60 @@
 @RunWith(Categories.class)
 @Categories.ExcludeCategory({DBTests.class, NonBuildTests.class})
 @Suite.SuiteClasses({
-//    org.alfresco.repo.usage.RepoUsageComponentTest.class,
-//    org.alfresco.repo.usage.UserUsageTest.class,
-//    org.alfresco.repo.usage.UserUsageTrackingComponentTest.class,
-//    org.alfresco.repo.version.VersionServiceImplTest.class,
-//    org.alfresco.repo.version.NodeServiceImplTest.class,
-//    org.alfresco.repo.version.ContentServiceImplTest.class,
-//    org.alfresco.repo.workflow.StartWorkflowActionExecuterTest.class,
-//    org.alfresco.repo.workflow.activiti.ActivitiWorkflowServiceIntegrationTest.class,
-//    org.alfresco.repo.workflow.activiti.ActivitiSpringTransactionTest.class,
-//    org.alfresco.repo.workflow.activiti.ActivitiTimerExecutionTest.class,
-//    org.alfresco.repo.invitation.ActivitiInvitationServiceImplTests.class,
-//    org.alfresco.repo.search.impl.solr.facet.SolrFacetConfigTest.class,
-//    org.alfresco.repo.doclink.DocumentLinkServiceImplTest.class,
+    org.alfresco.repo.usage.RepoUsageComponentTest.class,
+    org.alfresco.repo.usage.UserUsageTest.class,
+    org.alfresco.repo.usage.UserUsageTrackingComponentTest.class,
+    org.alfresco.repo.version.VersionServiceImplTest.class,
+    org.alfresco.repo.version.NodeServiceImplTest.class,
+    org.alfresco.repo.version.ContentServiceImplTest.class,
+    org.alfresco.repo.workflow.StartWorkflowActionExecuterTest.class,
+    org.alfresco.repo.workflow.activiti.ActivitiWorkflowServiceIntegrationTest.class,
+    org.alfresco.repo.workflow.activiti.ActivitiSpringTransactionTest.class,
+    org.alfresco.repo.workflow.activiti.ActivitiTimerExecutionTest.class,
+    org.alfresco.repo.invitation.ActivitiInvitationServiceImplTests.class,
+    org.alfresco.repo.search.impl.solr.facet.SolrFacetConfigTest.class,
+    org.alfresco.repo.doclink.DocumentLinkServiceImplTest.class,
 
     // This test opens, closes and again opens the alfresco application context.
-//    org.alfresco.repo.dictionary.CustomModelRepoRestartTest.class,
-//
-//    org.alfresco.repo.rendition.executer.XSLTFunctionsTest.class,
+    org.alfresco.repo.dictionary.CustomModelRepoRestartTest.class,
+
+    org.alfresco.repo.rendition.executer.XSLTFunctionsTest.class,
     org.alfresco.repo.rendition.executer.XSLTRenderingEngineTest.class,
-//    org.alfresco.repo.replication.ReplicationServiceIntegrationTest.class,
-//    org.alfresco.repo.template.XSLTProcessorTest.class,
-//    org.alfresco.repo.search.QueryRegisterComponentTest.class,
-//    org.alfresco.repo.search.SearchServiceTest.class,
-//    org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class,
-//    org.alfresco.repo.thumbnail.conditions.NodeEligibleForRethumbnailingEvaluatorTest.class,
-//    org.alfresco.repo.transaction.ConnectionPoolOverloadTest.class,
-//    org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinitionTest.class,
-//    org.alfresco.repo.node.integrity.IncompleteNodeTaggerTest.class,
-//    org.alfresco.repo.node.integrity.IntegrityTest.class,
-//    org.alfresco.repo.policy.PolicyComponentTransactionTest.class,
-//    org.alfresco.repo.forms.FormServiceImplTest.class,
-//    org.alfresco.repo.imap.ImapMessageTest.class,
-//    org.alfresco.repo.imap.ImapServiceImplCacheTest.class,
-//    org.alfresco.repo.imap.ImapServiceImplTest.class,
-//    org.alfresco.repo.bulkimport.impl.BulkImportTest.class,
-//    org.alfresco.repo.discussion.DiscussionServiceImplTest.class,
-//    org.alfresco.repo.transfer.NodeCrawlerTest.class,
-//    org.alfresco.repo.transfer.TransferServiceCallbackTest.class,
-//    org.alfresco.repo.transfer.TransferServiceImplTest.class,
-//    org.alfresco.repo.transfer.TransferServiceToBeRefactoredTest.class,
-//    org.alfresco.repo.transfer.manifest.ManifestIntegrationTest.class,
-//    org.alfresco.repo.transfer.script.ScriptTransferServiceTest.class,
-//    org.alfresco.util.schemacomp.DbToXMLTest.class,
-//    org.alfresco.util.schemacomp.ExportDbTest.class,
-//    org.alfresco.util.schemacomp.SchemaReferenceFileTest.class,
-//    org.alfresco.util.schemacomp.SchemaBootstrapTest.class,
-//    org.alfresco.repo.module.ModuleComponentHelperTest.class,
-//    org.alfresco.repo.node.getchildren.GetChildrenCannedQueryTest.class,
-//
-//    org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class,
-//    org.alfresco.service.ServiceRegistryTest.class,
-//
-//    // does not want to work in the same test suite as org.alfresco.repo.rule.* tests
-//    org.alfresco.opencmis.search.OpenCmisQueryTest.class
+    org.alfresco.repo.replication.ReplicationServiceIntegrationTest.class,
+    org.alfresco.repo.template.XSLTProcessorTest.class,
+    org.alfresco.repo.search.QueryRegisterComponentTest.class,
+    org.alfresco.repo.search.SearchServiceTest.class,
+    org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class,
+    org.alfresco.repo.thumbnail.conditions.NodeEligibleForRethumbnailingEvaluatorTest.class,
+    org.alfresco.repo.transaction.ConnectionPoolOverloadTest.class,
+    org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinitionTest.class,
+    org.alfresco.repo.node.integrity.IncompleteNodeTaggerTest.class,
+    org.alfresco.repo.node.integrity.IntegrityTest.class,
+    org.alfresco.repo.policy.PolicyComponentTransactionTest.class,
+    org.alfresco.repo.forms.FormServiceImplTest.class,
+    org.alfresco.repo.imap.ImapMessageTest.class,
+    org.alfresco.repo.imap.ImapServiceImplCacheTest.class,
+    org.alfresco.repo.imap.ImapServiceImplTest.class,
+    org.alfresco.repo.bulkimport.impl.BulkImportTest.class,
+    org.alfresco.repo.discussion.DiscussionServiceImplTest.class,
+    org.alfresco.repo.transfer.NodeCrawlerTest.class,
+    org.alfresco.repo.transfer.TransferServiceCallbackTest.class,
+    org.alfresco.repo.transfer.TransferServiceImplTest.class,
+    org.alfresco.repo.transfer.TransferServiceToBeRefactoredTest.class,
+    org.alfresco.repo.transfer.manifest.ManifestIntegrationTest.class,
+    org.alfresco.repo.transfer.script.ScriptTransferServiceTest.class,
+    org.alfresco.util.schemacomp.DbToXMLTest.class,
+    org.alfresco.util.schemacomp.ExportDbTest.class,
+    org.alfresco.util.schemacomp.SchemaReferenceFileTest.class,
+    org.alfresco.util.schemacomp.SchemaBootstrapTest.class,
+    org.alfresco.repo.module.ModuleComponentHelperTest.class,
+    org.alfresco.repo.node.getchildren.GetChildrenCannedQueryTest.class,
+
+    org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class,
+    org.alfresco.service.ServiceRegistryTest.class,
+
+    // does not want to work in the same test suite as org.alfresco.repo.rule.* tests
+    org.alfresco.opencmis.search.OpenCmisQueryTest.class
     })
 public class AppContext04TestSuite
 {
diff --git a/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java b/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
index af88473e555..9b399d7849c 100644
--- a/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
+++ b/repository/src/test/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
@@ -253,8 +253,8 @@ public void testImportXMLDocument() throws Exception
             assertNotNull(reader);
             String output = reader.getContentString();
             
-            log.debug("XSLT Processor output: " + output);
-            Diff myDiff = new Diff("<html>\n<body>\n<h2>My CD Collection</h2>\n<table border=\"1\">\n<tr bgcolor=\"#9acd32\">\n<th>Title</th><th>Artist</th>\n</tr>\n<tr>\n<td></td><td></td>\n</tr>\n</table>\n</body>\n</html>\n".replaceAll("\\s+",""), output.replaceAll("\\s+",""));
+            log.info("XSLT Processor output: " + output);
+            Diff myDiff = new Diff("<html>\n<body>\n<h2>My CD Collection</h2>\n<table border=\"1\">\n<tr bgcolor=\"#9acd32\">\n<th>Title</th><th>Artist</th>\n</tr>\n<tr>\n<td></td><td></td>\n</tr>\n</table>\n</body>\n</html>\n", output);
             assertTrue("Pieces of XML are similar " + myDiff, myDiff.similar());
         }
         catch (Exception ex)