diff --git a/src/main/resources/alfresco/application-context-core.xml b/src/main/resources/alfresco/application-context-core.xml
index c58b1c9749..259a181c03 100644
--- a/src/main/resources/alfresco/application-context-core.xml
+++ b/src/main/resources/alfresco/application-context-core.xml
@@ -52,5 +52,5 @@
     <import resource="classpath*:alfresco/dbscripts/*-context.xml" />
     <import resource="classpath*:alfresco/enterprise/authorization-context.xml" />
     <import resource="classpath*:alfresco/enterprise/enterprise-usage-services-context.xml" />
-    <import resource="classpath:alfresco/heartbeat-context.xml"/>
+    <import resource="classpath:alfresco/heartbeat/heartbeat-context.xml"/>
 </beans>
diff --git a/src/main/resources/alfresco/application-context-highlevel.xml b/src/main/resources/alfresco/application-context-highlevel.xml
index 8273b7ee91..a949204a9c 100644
--- a/src/main/resources/alfresco/application-context-highlevel.xml
+++ b/src/main/resources/alfresco/application-context-highlevel.xml
@@ -43,4 +43,5 @@
     <import resource="classpath*:alfresco/domain/*-context.xml" />
     <import resource="classpath*:alfresco/smartfolder-context.xml" />
     <import resource="classpath*:alfresco/reset-password-context.xml" />
+    <import resource="classpath:alfresco/heartbeat/heartbeat-repo-collector-context.xml"/>
 </beans>
diff --git a/src/main/resources/alfresco/heartbeat-context.xml b/src/main/resources/alfresco/heartbeat/heartbeat-context.xml
similarity index 61%
rename from src/main/resources/alfresco/heartbeat-context.xml
rename to src/main/resources/alfresco/heartbeat/heartbeat-context.xml
index 701df9a1dd..9c96d66bd4 100644
--- a/src/main/resources/alfresco/heartbeat-context.xml
+++ b/src/main/resources/alfresco/heartbeat/heartbeat-context.xml
@@ -23,14 +23,4 @@
         <property name="hbDataCollectorService" ref="hbDataCollectorService"/>
     </bean>
 
-    <!-- HeartBeat repository data collector -->
-    <bean id="repositoryDataCollector" class="org.alfresco.heartbeat.RepositoryDataCollector" parent="hbBaseDataCollector" init-method="register">
-        <property name="currentRepoDescriptorDAO" ref="currentRepoDescriptorDAO"/>
-        <property name="serverDescriptorDAO" ref="serverDescriptorDAO"/>
-        <property name="authorityService" ref="authorityService"/>
-        <property name="repoUsageComponent" ref="repoUsageComponent"/>
-        <property name="transactionService" ref="transactionService"/>
-        <property name="customModelService" ref="customModelService"/>
-    </bean>
-
 </beans>
diff --git a/src/main/resources/alfresco/heartbeat/heartbeat-repo-collector-context.xml b/src/main/resources/alfresco/heartbeat/heartbeat-repo-collector-context.xml
new file mode 100644
index 0000000000..67ea957994
--- /dev/null
+++ b/src/main/resources/alfresco/heartbeat/heartbeat-repo-collector-context.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+
+    <!-- HeartBeat repository data collector -->
+    <bean id="repositoryDataCollector" class="org.alfresco.heartbeat.RepositoryDataCollector" parent="hbBaseDataCollector" init-method="register">
+        <property name="currentRepoDescriptorDAO" ref="currentRepoDescriptorDAO"/>
+        <property name="serverDescriptorDAO" ref="serverDescriptorDAO"/>
+        <property name="authorityService" ref="authorityService"/>
+        <property name="repoUsageComponent" ref="repoUsageComponent"/>
+        <property name="transactionService" ref="transactionService"/>
+        <property name="customModelService" ref="customModelService"/>
+    </bean>
+
+</beans>
diff --git a/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java b/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java
index 8d8098cb07..d658dc4a71 100644
--- a/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java
+++ b/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java
@@ -77,13 +77,11 @@ public class HBDataCollectorServiceImplTest
 
         dataCollectorService.enabled(true);
         verify(mockDataSenderService).enable(true);
-
     }
 
     @Test
     public void testCollectAndSendData()
     {
-
         // Set up dummy collector 1
         HBData c1Data = new HBData("sys", "c1","1.0",null);
         HBBaseDataCollector c1 = new DummyCollector(c1Data);
diff --git a/src/test/java/org/alfresco/heartbeat/HeartBeatTest.java b/src/test/java/org/alfresco/heartbeat/HeartBeatTest.java
index 1f206089f8..c7b908e818 100644
--- a/src/test/java/org/alfresco/heartbeat/HeartBeatTest.java
+++ b/src/test/java/org/alfresco/heartbeat/HeartBeatTest.java
@@ -36,9 +36,7 @@ import org.quartz.SchedulerException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-
 import java.util.Arrays;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -46,11 +44,15 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+/**
+ * @author eknizat
+ */
 public class HeartBeatTest
 {
 
-
-    private static final String[] CONFIG_LOCATIONS = new String[] {"alfresco/scheduler-core-context.xml", "org/alfresco/util/test-scheduled-jobs-context.xml"};
+    private static final String[] CONFIG_LOCATIONS = new String[] {
+            "classpath:alfresco/scheduler-core-context.xml",
+            "classpath:org/alfresco/heartbeat/test-heartbeat-context.xml"};
     private ApplicationContext context;
 
     LicenseService mockLicenseService;
@@ -60,7 +62,6 @@ public class HeartBeatTest
     @Before
     public void setUp()
     {
-
         // New context with scheduler
         context = new ClassPathXmlApplicationContext(CONFIG_LOCATIONS);
 
@@ -71,13 +72,11 @@ public class HeartBeatTest
         ((ConfigurableApplicationContext) context).getBeanFactory().registerSingleton("hbDataCollectorService",mockDataCollectorService);
 
         mockDataSenderService = mock(HBDataSenderService.class);
-
     }
 
     @Test
     public void testHBRegistersWithLicenceService()
     {
-
         HeartBeat heartbeat = new HeartBeat(context,false);
 
         // Check that HearBeat registers itself with the licence service
@@ -87,7 +86,6 @@ public class HeartBeatTest
     @Test
     public void testJobSchedulingWhenEnabled()
     {
-
         // Enable heartbeat in data collector service ( as if set in prop file)
         when(mockDataCollectorService.isEnabledByDefault()).thenReturn(true);
 
@@ -97,29 +95,24 @@ public class HeartBeatTest
         assertTrue("Job was not scheduled but HB is enabled", isJobScheduled());
     }
 
-
     @Test
     public void testJobSchedulingWhenDisabled()
     {
-
         // Disable heartbeat in data collector service ( as if set in prop file)
         when(mockDataCollectorService.isEnabledByDefault()).thenReturn(false);
 
         HeartBeat heartbeat = new HeartBeat(context,true);
 
-        // Check that the job is scheduled when heartbeat is disabled
+        // Check that the job is not scheduled when heartbeat is disabled
         assertFalse("Job was scheduled but HB is disabled", isJobScheduled());
-
     }
 
-
     /**
      * Heartbeat enabled by default but disabled in licence on onLicenseChange
      */
     @Test
     public void testOnLicenseChangeOverridesDefaultEnabled()
     {
-
         // Enable heartbeat in data collector service ( as if set in prop file)
         when(mockDataCollectorService.isEnabledByDefault()).thenReturn(true);
 
@@ -137,7 +130,6 @@ public class HeartBeatTest
         // Check heartbeat is disabled and job unscheduled
         assertFalse(heartbeat.isEnabled());
         assertFalse("Job should be unscheduled.",isJobScheduled());
-
     }
 
     /**
@@ -165,11 +157,9 @@ public class HeartBeatTest
         assertTrue("Job should be scheduled.",isJobScheduled());
     }
 
-
     @Test
     public void testOnLicenceFailRevertsToEnabled()
     {
-
         // Enable heartbeat in data collector service ( as if set in prop file)
         when(mockDataCollectorService.isEnabledByDefault()).thenReturn(true);
 
@@ -189,15 +179,11 @@ public class HeartBeatTest
         // Check heartbeat is disabled and job unscheduled
         assertTrue(heartbeat.isEnabled());
         assertTrue("Job should be unscheduled.",isJobScheduled());
-
-
     }
 
-
     @Test
     public void testOnLicenceFailRevertsToDisabled()
     {
-
         // Disable heartbeat in data collector service ( as if set in prop file)
         when(mockDataCollectorService.isEnabledByDefault()).thenReturn(false);
 
@@ -217,22 +203,21 @@ public class HeartBeatTest
         // Check heartbeat is disabled and job unscheduled
         assertFalse(heartbeat.isEnabled());
         assertFalse("Job should be unscheduled.",isJobScheduled());
-
     }
 
-
     private boolean isJobScheduled()
     {
         Scheduler scheduler = (Scheduler) context.getBean("schedulerFactory");
         String[] jobs = {};
-        try {
+        try
+        {
             jobs = scheduler.getJobNames( Scheduler.DEFAULT_GROUP);
-        } catch (SchedulerException e) {
+        } catch (SchedulerException e)
+        {
             e.printStackTrace();
             fail("Exception before assertion.");
         }
 
         return Arrays.asList(jobs).contains("heartbeat");
     }
-
 }