diff --git a/source/java/org/alfresco/repo/tenant/MultiTDemoSystemTest.java b/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java
old mode 100755
new mode 100644
similarity index 95%
rename from source/java/org/alfresco/repo/tenant/MultiTDemoSystemTest.java
rename to source/java/org/alfresco/repo/tenant/MultiTDemoTest.java
index b417fb8622..5f09c8ff40
--- a/source/java/org/alfresco/repo/tenant/MultiTDemoSystemTest.java
+++ b/source/java/org/alfresco/repo/tenant/MultiTDemoTest.java
@@ -62,13 +62,16 @@ import org.alfresco.util.ApplicationContextHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class MultiTDemoSystemTest extends TestCase
+public class MultiTDemoTest extends TestCase
 {
-    private static Log logger = LogFactory.getLog(MultiTDemoSystemTest.class);
-
-    private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
+    private static Log logger = LogFactory.getLog(MultiTDemoTest.class);
 
+    private static ApplicationContext ctx =new ClassPathXmlApplicationContext(
+            new String[] {ApplicationContextHelper.CONFIG_LOCATIONS[0], "classpath:tenant/mt-*context.xml"}
+            );
+    
     private NodeService nodeService;
     private AuthenticationService authenticationService;
     private PersonService personService;
@@ -105,7 +108,7 @@ public class MultiTDemoSystemTest extends TestCase
     public static StoreRef SPACES_STORE = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
 
     
-    public MultiTDemoSystemTest()
+    public MultiTDemoTest()
     {
     }
 
@@ -559,7 +562,7 @@ public class MultiTDemoSystemTest extends TestCase
     public static void main(String args[]) 
     {
         System.out.println(new Date());
-        junit.textui.TestRunner.run(MultiTDemoSystemTest.class);
+        junit.textui.TestRunner.run(MultiTDemoTest.class);
         System.out.println(new Date());
     }
      
diff --git a/source/test-resources/tenant/mt-admin-context.xml b/source/test-resources/tenant/mt-admin-context.xml
new file mode 100644
index 0000000000..318d3bee71
--- /dev/null
+++ b/source/test-resources/tenant/mt-admin-context.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+
+   <!--                                           -->
+   <!-- MT Admin Service Implementation -->
+   <!--                                           -->
+            
+   <bean id="tenantAdminService" class="org.alfresco.repo.tenant.MultiTAdminServiceImpl">
+   
+      <!--
+      <property name="nodeService" ref="NodeService"/>
+      -->
+      <property name="nodeService" ref="dbNodeServiceImpl"/> <!-- TODO - go direct, until we expose deleteStore via public NodeService API -->
+      <property name="dictionaryComponent" ref="dictionaryService"/>
+      <property name="authenticationComponent" ref="authenticationComponent"/>
+      <property name="repoAdminService" ref="RepoAdminService"/>
+      <property name="tenantService" ref="tenantService"/>
+      <property name="transactionService" ref="transactionComponent"/>
+      <property name="attributeService" ref="AttributeService"/>
+      <property name="passwordEncoder" ref="passwordEncoder"/>
+      <property name="tenantFileContentStore" ref="tenantFileContentStore"/>     
+      <property name="workflowService" ref="WorkflowService"/>
+      <property name="repositoryExporterService" ref="repositoryExporterComponent"/>
+      <property name="workflowDeployer" ref="workflowBootstrap"/>
+      <property name="moduleService" ref="moduleService"/>
+      
+   </bean>
+                
+   <bean id="tenantInterpreter" class="org.alfresco.repo.tenant.TenantInterpreter">
+        <property name="transactionService" ref="transactionComponent"/>
+        <property name="tenantAdminService" ref="tenantAdminService"/>       
+        <property name="tenantService" ref="tenantService"/>        
+        <property name="authenticationService" ref="AuthenticationService"/>
+   </bean>
+
+   <bean id="tenantInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+        <property name="resourceBundles">
+            <list>
+                <value>alfresco.messages.tenant-interpreter-help</value>
+            </list>
+        </property>
+   </bean>
+   
+</beans>
diff --git a/source/test-resources/tenant/mt-contentstore-context.xml b/source/test-resources/tenant/mt-contentstore-context.xml
new file mode 100644
index 0000000000..dec5bd5289
--- /dev/null
+++ b/source/test-resources/tenant/mt-contentstore-context.xml
@@ -0,0 +1,76 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+
+   <!-- ======================================= -->
+   <!-- Tenant Routing File Content Store Cache -->
+   <!-- ======================================= -->
+   
+   <bean name="tenantFileStoresCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+      <property name="cache">
+         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
+            <property name="cacheManager">
+               <ref bean="internalEHCacheManager" />
+            </property>
+            <property name="cacheName">
+               <value>org.alfresco.cache.tenantFileStoresCache</value>
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <!--                                   -->
+   <!-- Tenant Routing File Content Store -->
+   <!--                                   -->
+   
+   <bean id="tenantFileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" init-method="init">
+      <property name="defaultRootDir">
+         <value>${dir.contentstore}</value>
+      </property>
+      <property name="tenantService">
+         <ref bean="tenantService" />
+      </property>
+      <property name="storesCache">
+         <ref bean="tenantFileStoresCache" />
+      </property>    
+   </bean>
+   
+   <!-- override content store cleaner to use tenant routing file content store -->
+   <!-- Performs the content cleanup -->
+   <bean id="contentStoreCleaner" class="org.alfresco.repo.content.cleanup.ContentStoreCleaner" >
+      <property name="dictionaryService">
+         <ref bean="dictionaryService" />
+      </property>
+      <property name="nodeDaoService" >
+         <ref bean="nodeDaoService" />
+      </property>
+      <property name="avmNodeDAO">
+            <ref bean="avmNodeDAO"/>
+      </property>
+      <property name="transactionService" >
+         <ref bean="transactionService" />
+      </property>
+      <property name="protectDays" >
+         <value>14</value>
+      </property>
+      <property name="stores" >
+         <list>
+            <ref bean="tenantFileContentStore" />
+         </list>
+      </property>
+      <property name="listeners" >
+         <list>
+            <ref bean="deletedContentBackupListener" />
+         </list>
+      </property>
+   </bean>
+
+   <!-- override content service to use tenant routing file content store -->
+   <bean id="contentService" parent="baseContentService">
+      <property name="store">
+          <ref bean="tenantFileContentStore" />
+      </property>
+   </bean>
+       
+</beans>
diff --git a/source/test-resources/tenant/mt-context.xml b/source/test-resources/tenant/mt-context.xml
new file mode 100644
index 0000000000..d2a1d3f43a
--- /dev/null
+++ b/source/test-resources/tenant/mt-context.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+  
+   <!-- ===================================== -->
+   <!-- Tenants Cache                         -->
+   <!-- ===================================== -->
+
+   <!-- The cross-transaction shared cache for in-memory Tenants -->
+   
+   <bean name="tenantsSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+      <property name="cache">
+         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
+            <property name="cacheManager">
+               <ref bean="internalEHCacheManager" />
+            </property>
+            <property name="cacheName">
+               <value>org.alfresco.cache.tenantsCache</value>
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <!-- The transactional cache for in-memory Tenants -->
+   
+   <bean name="tenantsCache" class="org.alfresco.repo.cache.TransactionalCache">
+      <property name="sharedCache">
+         <ref bean="tenantsSharedCache" />
+      </property>
+      <property name="cacheManager" >
+         <ref bean="transactionalEHCacheManager" />
+      </property>
+      <property name="name">
+         <value>org.alfresco.tenantsTransactionalCache</value>
+      </property>
+      <property name="maxCacheSize">
+         <value>10</value>
+      </property>
+   </bean>
+   
+
+   <!--                                     -->
+   <!-- MT Service Implementation -->
+   <!--                                     -->
+             
+   <bean id="tenantService" class="org.alfresco.repo.tenant.MultiTServiceImpl">
+   
+      <property name="tenantsCache">
+         <ref bean="tenantsCache"/>
+      </property>
+      
+   </bean>
+       
+</beans>