diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 4e38f52100..1963c14b43 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -161,6 +161,9 @@
                 <entry key="versionStore">
                     <ref bean="luceneIndexerAndSearcherFactory"></ref>
                 </entry>
+                <entry key="avm">
+                    <ref bean="luceneIndexerAndSearcherFactory"></ref>
+                </entry>
             </map>
         </property>
     </bean>
@@ -180,6 +183,9 @@
                 <entry key="versionStore">
                     <ref bean="luceneCategoryService"></ref>
                 </entry>
+                <entry key="avm">
+                    <ref bean="luceneCategoryService"></ref>
+                </entry>
             </map>
         </property>
     </bean>
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index c26a9e7309..6853c6de5b 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.alfresco.service.cmr.avm.LayeringDescriptor;
 import org.alfresco.service.cmr.avm.VersionDescriptor;
+import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.security.AccessPermission;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
@@ -2288,4 +2289,25 @@ public class AVMServiceTest extends AVMServiceTestBase
             fail();
         }
     }
+    
+    /**
+     * Test FileFolderService with AVM.
+     */
+    public void testFileFolderService()
+    {
+        try
+        {
+            setupBasicTree();
+            FileFolderService ffs = (FileFolderService)fContext.getBean("FileFolderService");
+            assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c"), 
+                       "banana", ContentModel.TYPE_CONTENT) != null);
+            fService.createSnapshot("main");
+            System.out.println(recursiveList("main", -1, true));
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace(System.err);
+            fail();
+        }
+    }
 }