diff --git a/source/test-java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java b/source/test-java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java
index fe85596850..c06f0b267f 100644
--- a/source/test-java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java
+++ b/source/test-java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java
@@ -60,7 +60,7 @@ public class FullIndexRecoveryComponentTest extends TestCase
     
     public void setUp() throws Exception
     {
-        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene");
+        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
         indexRecoverer = (FullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.indexRecoveryComponent");
         nodeService = (NodeService) ctx.getBean("nodeService");
         transactionService = (TransactionService) ctx.getBean("transactionComponent");
diff --git a/source/test-java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java b/source/test-java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java
index 4d4e40f821..200f779d0e 100644
--- a/source/test-java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java
+++ b/source/test-java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java
@@ -75,7 +75,7 @@ public class IndexTransactionTrackerTest extends TestCase
         ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
         searchService = (SearchService) ctx.getBean("searchService");
         nodeService = (NodeService) ctx.getBean("nodeService");
-        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene");
+        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
         threadPoolExecutor = (ThreadPoolExecutor) luceneSubSystem.getApplicationContext().getBean("search.indexTrackerThreadPoolExecutor");
         fileFolderService = serviceRegistry.getFileFolderService();
         authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
diff --git a/source/test-java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java b/source/test-java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java
index 7c222b75c7..e9a43e6e2b 100644
--- a/source/test-java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java
+++ b/source/test-java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java
@@ -78,7 +78,7 @@ public class MissingContentReindexComponentTest extends TestCase
         searchService = serviceRegistry.getSearchService();
         nodeService = serviceRegistry.getNodeService();
         
-        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene");
+        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
         threadPoolExecutor = (ThreadPoolExecutor) luceneSubSystem.getApplicationContext().getBean("search.indexTrackerThreadPoolExecutor");
         fileFolderService = serviceRegistry.getFileFolderService();
         authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
diff --git a/source/test-java/org/alfresco/repo/search/impl/lucene/ALF947Test.java b/source/test-java/org/alfresco/repo/search/impl/lucene/ALF947Test.java
index fc1444727f..90573378b0 100644
--- a/source/test-java/org/alfresco/repo/search/impl/lucene/ALF947Test.java
+++ b/source/test-java/org/alfresco/repo/search/impl/lucene/ALF947Test.java
@@ -57,7 +57,7 @@ public class ALF947Test extends TestCase
     public void setUp() throws Exception
     {
         this.nodeService = (NodeService) ctx.getBean("dbNodeService");
-        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene");
+        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
         this.indexerAndSearcher = (LuceneIndexerAndSearcher) luceneSubSystem.getApplicationContext().getBean("search.admLuceneIndexerAndSearcherFactory");
         this.authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
         this.transactionService = (TransactionService) ctx.getBean("transactionComponent");
diff --git a/source/test-java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java b/source/test-java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java
index a9f2e9a1f8..ff2c7de301 100644
--- a/source/test-java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java
+++ b/source/test-java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java
@@ -54,7 +54,7 @@ public class LuceneIndexBackupComponentTest extends TestCase
         TransactionService transactionService = (TransactionService) ctx.getBean("transactionComponent");
         NodeService nodeService = (NodeService) ctx.getBean("NodeService");
         
-        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene");
+        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
         LuceneIndexerAndSearcher factory = (LuceneIndexerAndSearcher) luceneSubSystem.getApplicationContext().getBean("search.admLuceneIndexerAndSearcherFactory");
         
         this.authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent");
diff --git a/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java b/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java
index 83a83a130c..419389680d 100644
--- a/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java
+++ b/source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java
@@ -201,7 +201,7 @@ public class MultiTDemoTest extends TestCase
         repositoryHelper = (Repository) ctx.getBean("repositoryHelper");
         siteService = (SiteService) ctx.getBean("SiteService");
         
-        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("lucene");
+        ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly");
         indexRecoverer = (FullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.indexRecoveryComponent");
         AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // authenticate as super-admin
         
@@ -320,6 +320,7 @@ public class MultiTDemoTest extends TestCase
         // reindex
         Thread reindexThread = new Thread()
         {
+            @Override
             public void run()
             {
                 indexRecoverer.reindex();
@@ -1458,7 +1459,7 @@ public class MultiTDemoTest extends TestCase
                     NodeRef homeFolderNodeRef = (NodeRef)nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
                     assertFalse(homeFolderNodeRef.toString().contains(tenantDomain));
                     
-                    Map<QName, Serializable> props = (Map<QName, Serializable>)nodeService.getProperties(personNodeRef);
+                    Map<QName, Serializable> props = nodeService.getProperties(personNodeRef);
                     assertFalse(props.get(ContentModel.PROP_HOMEFOLDER).toString().contains(tenantDomain));
                     
                     // Test "store-identifier" property