diff --git a/source/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java b/source/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java
index a6a8b0fc17..a39deb59f3 100644
--- a/source/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java
+++ b/source/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java
@@ -87,6 +87,13 @@ public class UserUsageTrackingComponentTest extends TestCase
         contentUsageService = (ContentUsageService)applicationContext.getBean("ContentUsageService");
         
         userUsageTrackingComponent = (UserUsageTrackingComponent)applicationContext.getBean("userUsageTrackingComponent");
+
+        // Enable
+        ContentUsageImpl contentUsage = (ContentUsageImpl)applicationContext.getBean("contentUsageImpl");
+        contentUsage.setEnabled(true);
+        contentUsage.init();
+        userUsageTrackingComponent.setEnabled(true);
+        userUsageTrackingComponent.bootstrapInternal();
         
         AuthenticationUtil.setRunAsUserSystem();
         
@@ -95,6 +102,13 @@ public class UserUsageTrackingComponentTest extends TestCase
     
     protected void tearDown() throws Exception
     {
+        // Disable
+        ContentUsageImpl contentUsage = (ContentUsageImpl)applicationContext.getBean("contentUsageImpl");
+        contentUsage.setEnabled(false);
+        contentUsage.init();
+        userUsageTrackingComponent.setEnabled(false);
+        userUsageTrackingComponent.bootstrapInternal();
+
         if (clean)
         {
             deleteUsersAndContent();