diff --git a/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponent.java b/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponent.java
index eb5507e25f..cb888da357 100644
--- a/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponent.java
+++ b/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponent.java
@@ -326,7 +326,10 @@ public class FullIndexRecoveryComponent extends AbstractReindexComponent
                 // delete stores
                 for(StoreRef storeRef : nodeService.getStores())
                 {
-                    indexer.deleteIndex(storeRef);
+                    if(!storeRef.getProtocol().equals(StoreRef.PROTOCOL_AVM))
+                    {
+                        indexer.deleteIndex(storeRef);
+                    }
                 }
                 return null;
             }
diff --git a/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java b/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java
index 6237e3f5a6..362219e5b3 100644
--- a/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java
+++ b/source/java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java
@@ -161,6 +161,7 @@ public class FullIndexRecoveryComponentTest extends TestCase
     public synchronized void testReindexing() throws Exception
     {
         indexRecoverer.setRecoveryMode(FullIndexRecoveryComponent.RecoveryMode.FULL.name());
+        avmIndexRecoveryComponent.setRecoveryMode(FullIndexRecoveryComponent.RecoveryMode.FULL.name());
         // reindex
         Thread reindexThread = new Thread()
         {
@@ -176,11 +177,15 @@ public class FullIndexRecoveryComponentTest extends TestCase
                 avmIndexRecoveryComponent.reindex();
             }
         };
-        reindexThread.setDaemon(true);
-        avmReindexThread.setDaemon(true);
+        //reindexThread.setDaemon(true);
+        //avmReindexThread.setDaemon(true);
         reindexThread.start();
         avmReindexThread.start();
-//        reindexThread.run();
+        
+        // must allow the rebuild to complete or the test after this one will fail to validate their indexes 
+        // - as they now will be deleted.
+        reindexThread.join();
+        avmReindexThread.join();
         
         // wait a bit and then terminate
         wait(20000);