diff --git a/rm-server/build.gradle b/rm-server/build.gradle
index d9ef8e6aa0..d1654f7507 100644
--- a/rm-server/build.gradle
+++ b/rm-server/build.gradle
@@ -99,3 +99,24 @@ test {
 	}
 }
 
+task deploydemo << {
+
+    def demoDir = "demo/${demo}"
+	def demoDirObj = file(demoDir)
+
+	explodedWebAppDir = new File("${tomcatRoot}/webapps/${webAppName}")
+	if (explodedWebAppDir.exists() == true) {
+	
+			if (demoDirObj.exists() == true) {
+				copy {
+					from(demoDir) 
+					into "${explodedWebAppDir}/WEB-INF/classes/alfresco/module/org_alfresco_module_rm/${demoDir}"
+					
+				}
+			}
+	}
+	else {
+		println "Exploded webapp directory ${explodedWebAppDir} does not exist."
+	}
+}
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index 97cf25064a..188fd27c0b 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -237,5 +237,8 @@
 
    <!-- Import the RM webscript's -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml"/>
+   
+   <!-- Import of installed demos -->
+   <import resource="classpath*:alfresco/module/org_alfresco_module_rm/demo/*/demo-context.xml"/> 
 
 </beans>
diff --git a/rm-server/gradle.properties b/rm-server/gradle.properties
index ac8b7af92f..9262b59971 100644
--- a/rm-server/gradle.properties
+++ b/rm-server/gradle.properties
@@ -5,4 +5,6 @@ webAppName=alfresco
 warFile=alfresco.war
 solrFile=alfresco-solr.zip
 
-tomcatEnv=TOMCAT_HOME
\ No newline at end of file
+tomcatEnv=TOMCAT_HOME
+
+demo=customerservice
\ No newline at end of file
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java
index 5ca7a0aff9..ea39abd892 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java
@@ -51,10 +51,6 @@ public class FilePlanRoleServiceImplTest extends BaseRMTestCase
                 String allRolesGroup = filePlanRoleService.getAllRolesContainerGroup(filePlan);
                 assertNotNull(allRolesGroup);
                 
-                Set<String> allRoles = authorityService.getContainedAuthorities(AuthorityType.GROUP, allRolesGroup, true);
-                assertNotNull(allRoles);
-                assertTrue(allRoles.contains(filePlanRoleService.getRole(filePlan, ROLE_NAME_POWER_USER).getRoleGroupName()));                
-                
                 return null;
             }
         });