diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index 3b82d145e4..3d2c5052e3 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -98,6 +98,12 @@ public class AVMServiceTest extends AVMServiceTestBase
         super.testSetup();
     }
     
+    public void testSetupAndQueriesAgainstBasicTree() throws Exception
+    {
+        setupBasicTree();
+        runQueriesAgainstBasicTree("main");
+    }
+    
     public void test_ALF_786() throws Exception
     {
         int threads= 4;
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
index b7252bc0e7..ca36d2ba70 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
@@ -92,7 +92,6 @@ public class AVMServiceTestBase extends TestCase
     
     public void testSetup() throws Exception
     {
-        setupBasicTree();
     }
     
     /**
@@ -289,7 +288,6 @@ public class AVMServiceTestBase extends TestCase
         throws IOException
     {
         setupBasicTree0();
-        runQueriesAgainstBasicTree("main");
     }
 
     protected void runQueriesAgainstBasicTree(String store)