diff --git a/server/src/test/java/com/metamx/druid/master/DruidMasterTest.java b/server/src/test/java/com/metamx/druid/master/DruidMasterTest.java
index e47afd8d109..213e350f76b 100644
--- a/server/src/test/java/com/metamx/druid/master/DruidMasterTest.java
+++ b/server/src/test/java/com/metamx/druid/master/DruidMasterTest.java
@@ -47,7 +47,7 @@ public class DruidMasterTest
   private LoadQueueTaskMaster taskMaster;
   private DatabaseSegmentManager databaseSegmentManager;
   private SingleServerInventoryView serverInventoryView;
-  private ScheduledExecutorService scheduledExecutorService;
+  private ScheduledExecutorFactory scheduledExecutorFactory;
   private DruidServer druidServer;
   private DataSegment segment;
   private ConcurrentMap<String, LoadQueuePeon> loadManagementPeons;
@@ -65,8 +65,8 @@ public class DruidMasterTest
     databaseSegmentManager = EasyMock.createNiceMock(DatabaseSegmentManager.class);
     EasyMock.replay(databaseSegmentManager);
 
-    scheduledExecutorService = EasyMock.createNiceMock(ScheduledExecutorService.class);
-    EasyMock.replay(scheduledExecutorService);
+    scheduledExecutorFactory = EasyMock.createNiceMock(ScheduledExecutorFactory.class);
+    EasyMock.replay(scheduledExecutorFactory);
 
     master = new DruidMaster(
         new DruidMasterConfig()
@@ -139,7 +139,7 @@ public class DruidMasterTest
         null,
         curator,
         new NoopServiceEmitter(),
-        scheduledExecutorService,
+        scheduledExecutorFactory,
         null,
         taskMaster,
         loadManagementPeons
diff --git a/server/src/test/java/com/metamx/druid/master/LoadQueuePeonTester.java b/server/src/test/java/com/metamx/druid/master/LoadQueuePeonTester.java
index 3594c660c09..366cde87e1d 100644
--- a/server/src/test/java/com/metamx/druid/master/LoadQueuePeonTester.java
+++ b/server/src/test/java/com/metamx/druid/master/LoadQueuePeonTester.java
@@ -10,7 +10,7 @@ public class LoadQueuePeonTester extends LoadQueuePeon
 
   public LoadQueuePeonTester()
   {
-    super(null, null, null, null, null, null);
+    super(null, null, null, null, null);
   }
 
   @Override