diff --git a/rm-community/rm-community-repo/test/resources/test-context.xml b/rm-community/rm-community-repo/test/resources/test-context.xml
index c78ea2e72d..7e0f0e1bd2 100644
--- a/rm-community/rm-community-repo/test/resources/test-context.xml
+++ b/rm-community/rm-community-repo/test/resources/test-context.xml
@@ -116,15 +116,19 @@
    </bean>
 
    <!--  Make sure the job doesn't fire during the test -->
-   <bean id="scheduledPublishUpdatesJobTrigger" class="org.alfresco.util.CronTriggerBean">
-      <property name="jobDetail">
-         <ref bean="scheduledPublishUpdatesJobDetail" />
-      </property>
-      <property name="scheduler">
-         <ref bean="schedulerFactory" />
-      </property>
-      <property name="cronExpression">
-         <value>0 30 3 * * ?</value>
+   <bean id="scheduledPublishUpdatesSchedulerAccessor" class="org.alfresco.schedule.AlfrescoSchedulerAccessorBean">
+      <property name="scheduler" ref="schedulerFactory" />
+      <property name="triggers">
+         <list>
+            <bean id="scheduledPublishUpdatesJobTrigger"
+                  class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+               <property name="jobDetail" ref="scheduledPublishUpdatesJobDetail" />
+               <property name="cronExpression">
+                  <!-- <value>0 30 3 * * ?</value> -->
+                  <value>0 30 3 * * ?</value>
+               </property>
+            </bean>
+         </list>
       </property>
    </bean>
 
diff --git a/rm-community/rm-community-repo/test/resources/test-job-context.xml b/rm-community/rm-community-repo/test/resources/test-job-context.xml
index fdf8323a38..3760eb3741 100644
--- a/rm-community/rm-community-repo/test/resources/test-job-context.xml
+++ b/rm-community/rm-community-repo/test/resources/test-job-context.xml
@@ -4,15 +4,16 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
          http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-   <bean id="scheduledDispositionLifecyceleJobTrigger" class="org.alfresco.util.CronTriggerBean">
-      <property name="jobDetail">
-         <ref bean="scheduledDispositionLifecyceleJobDetail" />
-      </property>
-      <property name="scheduler">
-         <ref bean="schedulerFactory" />
-      </property>
-      <property name="cronExpression">
-         <value>0/30 * * * * ?</value>
+   <bean id="scheduledDispositionLifecyceleSchedulerAccessor"
+         class="org.alfresco.schedule.AlfrescoSchedulerAccessorBean">
+      <property name="scheduler" ref="schedulerFactory" />
+      <property name="triggers">
+         <bean id="scheduledDispositionLifecyceleJobTrigger"
+               class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+            <property name="jobDetail" ref="scheduledDispositionLifecyceleJobDetail" />
+            <!-- <value>0/30 * * * * ?</value> -->
+            <property name="cronExpression" value="0/30 * * * *?" />
+         </bean>
       </property>
    </bean>