diff --git a/source/test-java/org/alfresco/util/CronTriggerBeanTest.java b/source/test-java/org/alfresco/util/CronTriggerBeanTest.java
index fc82288fb0..aafcc95ff0 100644
--- a/source/test-java/org/alfresco/util/CronTriggerBeanTest.java
+++ b/source/test-java/org/alfresco/util/CronTriggerBeanTest.java
@@ -2,32 +2,28 @@ package org.alfresco.util;
 
 import static org.junit.Assert.*;
 
-import java.text.ParseException;
+import java.util.ArrayList;
 
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.quartz.CronTrigger;
 import org.quartz.Job;
-import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.quartz.Trigger;
 import org.quartz.impl.StdSchedulerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class CronTriggerBeanTest {
 
-    private ClassPathXmlApplicationContext ctx;
-	private static int dummyJobRuns; 
-	
+	private ClassPathXmlApplicationContext ctx;
+	private Scheduler scheduler;
+	private static ArrayList<Long> dummyJobRuns;
+
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
 	}
@@ -38,88 +34,112 @@ public class CronTriggerBeanTest {
 
 	@Before
 	public void setUp() throws Exception {
-		dummyJobRuns = 0;
+		dummyJobRuns = new ArrayList<>();
+		this.ctx = null;
+		this.scheduler = null;
 	}
 
 	@After
 	public void tearDown() throws Exception {
+		try {
+			this.scheduler.shutdown();
+		} catch (Exception e) {
+			// do nothing
+		}
+		
 		try {
 			ctx.close();
-		} catch(Exception e) { 
+		} catch (Exception e) {
 			// do nothing
 		}
 	}
 
 	@Test
 	public void testCodedCronTriggerBean() throws Exception {
-		assertEquals(0, dummyJobRuns);
-	    Scheduler scheduler = StdSchedulerFactory.getDefaultScheduler();
-    	scheduler.start();
-    	CronTriggerBean ctBean = new CronTriggerBean();
-    	ctBean.setBeanName("Dummy");
-    	ctBean.setCronExpression("0/1 * * * * ? *");
-    	ctBean.setEnabled(true);
-    	JobDetail jobDetail = new JobDetail("DummyJob", "DefaultGroup", DummyJob.class);
-		ctBean.setJobDetail(jobDetail );
+		assertEquals(0, dummyJobRuns.size());
+		scheduler = StdSchedulerFactory.getDefaultScheduler();
+		scheduler.start();
+		CronTriggerBean ctBean = new CronTriggerBean();
+		ctBean.setBeanName("Dummy");
+		ctBean.setCronExpression("0/1 * * * * ? *");
+		ctBean.setEnabled(true);
+		JobDetail jobDetail = new JobDetail("DummyJob", "DefaultGroup", DummyJob.class);
+		ctBean.setJobDetail(jobDetail);
 		ctBean.setScheduler(scheduler);
 		ctBean.afterPropertiesSet();
 
 		Thread.sleep(1000);
-        int runs = dummyJobRuns;
-        assertTrue(runs > 0);
+		int runs = dummyJobRuns.size();
+		assertTrue(runs > 0);
 
-    	scheduler.shutdown();
+		scheduler.shutdown();
 		Thread.sleep(1000);
-		assertEquals(runs, dummyJobRuns);
+		assertEquals(runs, dummyJobRuns.size());
 		Thread.sleep(1000);
-		assertEquals(runs, dummyJobRuns);
+		assertEquals(runs, dummyJobRuns.size());
 	}
 
-
-	@Ignore
 	@Test
 	public void testCodedDelayedCronTriggerBean() throws Exception {
-		assertEquals(0, dummyJobRuns);
-	    Scheduler scheduler = StdSchedulerFactory.getDefaultScheduler();
-    	scheduler.start();
-    	CronTriggerBean ctBean = new CronTriggerBean();
-    	ctBean.setBeanName("Dummy");
-    	ctBean.setCronExpression("0/1 * * * * ? *");
-    	ctBean.setEnabled(true);
-    	JobDetail jobDetail = new JobDetail("DummyJob", "DefaultGroup", DummyJob.class);
-		ctBean.setJobDetail(jobDetail );
+		assertEquals(0, dummyJobRuns.size());
+		Scheduler scheduler = StdSchedulerFactory.getDefaultScheduler();
+		scheduler.start();
+		CronTriggerBean ctBean = new CronTriggerBean();
+		ctBean.setBeanName("Dummy");
+		ctBean.setCronExpression("0/1 * * * * ? *");
+		ctBean.setEnabled(true);
+		JobDetail jobDetail = new JobDetail("DummyJob", "DefaultGroup", DummyJob.class);
+		ctBean.setJobDetail(jobDetail);
 		ctBean.setScheduler(scheduler);
+		final long START_DELAY = 4000L;
+		ctBean.setStartDelay(START_DELAY);
 		ctBean.afterPropertiesSet();
-    	
-		// Validate delayed runs
+
+		// It should not have run during the delay. Give a second precision leeway
+		Thread.sleep(START_DELAY - 1000);
+		assertEquals(0, dummyJobRuns.size());
+		// It should have had a chance to run after the delay
+		Thread.sleep(1000);
+		int runs = dummyJobRuns.size();
+		assertTrue(runs > 0);
+		// It should not have run again after shutdown
+		scheduler.shutdown();
+		Thread.sleep(1000);
+		assertEquals(runs, dummyJobRuns.size());
+		// Indeed after another second, it should not have changed.
+		Thread.sleep(1000);
+		assertEquals(runs, dummyJobRuns.size());
 	}
-	
+
 	@Test
-	public void testConfiguredCronTriggerBean() throws BeansException, Exception {
-        assertEquals(0, dummyJobRuns);
-        ctx = new ClassPathXmlApplicationContext("alfresco/scheduler-core-context.xml",
-        		"org/alfresco/util/test-scheduled-jobs-context.xml");
-        
-        CronTriggerBean ctBean = ctx.getBean(CronTriggerBean.class);
-        Scheduler scheduler = ctBean.getScheduler();
-        scheduler.start();
+	public void testConfiguredCronTriggerBean() throws BeansException,
+			Exception {
+		assertEquals(0, dummyJobRuns.size());
+		ctx = new ClassPathXmlApplicationContext(
+				"alfresco/scheduler-core-context.xml",
+				"org/alfresco/util/test-scheduled-jobs-context.xml");
+		CronTriggerBean ctBean = ctx.getBean(CronTriggerBean.class);
+		scheduler = ctBean.getScheduler();
+		scheduler.start();
 
-		Thread.sleep(1000);
-        int runs = dummyJobRuns;
-        assertTrue(runs > 0);
+		// After the interval, there should be at least one run
+		final long INTERVAL = 2000L;
+		Thread.sleep(INTERVAL);
+		int runs = dummyJobRuns.size();
+		assertTrue(runs > 0);
 
-    	ctx.close();
-		Thread.sleep(1000);
-		assertEquals(runs, dummyJobRuns);
-		Thread.sleep(1000);
-		assertEquals(runs, dummyJobRuns);
+		// When the context closes, the scheduler should close, thereby stopping the job
+		ctx.close();
+		Thread.sleep(INTERVAL);
+		assertEquals(runs, dummyJobRuns.size());
+		Thread.sleep(INTERVAL);
+		assertEquals(runs, dummyJobRuns.size());
 	}
 
-    public static class DummyJob implements Job
-    {
-    	public void execute(JobExecutionContext context) throws JobExecutionException
-        {
-    		dummyJobRuns++;
-        }
-    }	
+	public static class DummyJob implements Job {
+		public void execute(JobExecutionContext context) throws JobExecutionException {
+			long now = System.currentTimeMillis();
+			dummyJobRuns.add(now);
+		}
+	}
 }
diff --git a/source/test-resources/org/alfresco/util/test-scheduled-jobs-context.xml b/source/test-resources/org/alfresco/util/test-scheduled-jobs-context.xml
index c8d3fb7967..0e96fd54f7 100644
--- a/source/test-resources/org/alfresco/util/test-scheduled-jobs-context.xml
+++ b/source/test-resources/org/alfresco/util/test-scheduled-jobs-context.xml
@@ -45,10 +45,10 @@
         </property>
         <!-- trigger at 3am each day -->
         <property name="cronExpression">
-            <value>0/1 * * * * ?</value>
+            <value>0/2 * * * * ?</value>
         </property>
         <property name="beanName">
-        	<value>dummy</value>
+        	<value>dummyTriggerBean</value>
         </property>
     </bean>