diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
index 03d8835ac42..59a375b863d 100644
--- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
+++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
@@ -54,7 +54,8 @@ import org.elasticsearch.xpack.rest.action.RestXPackInfoAction;
 import org.elasticsearch.xpack.rest.action.RestXPackUsageAction;
 import org.elasticsearch.xpack.security.Security;
 import org.elasticsearch.xpack.security.authc.AuthenticationModule;
-import org.elasticsearch.xpack.support.clock.ClockModule;
+import org.elasticsearch.xpack.support.clock.Clock;
+import org.elasticsearch.xpack.support.clock.SystemClock;
 import org.elasticsearch.xpack.watcher.Watcher;
 
 public class XPackPlugin extends Plugin implements ScriptPlugin, ActionPlugin {
@@ -131,10 +132,15 @@ public class XPackPlugin extends Plugin implements ScriptPlugin, ActionPlugin {
         return Collections.emptyList();
     }
 
+    // overridable by tests
+    protected Clock getClock() {
+        return SystemClock.INSTANCE;
+    }
+
     @Override
     public Collection<Module> nodeModules() {
         ArrayList<Module> modules = new ArrayList<>();
-        modules.add(new ClockModule());
+        modules.add(b -> b.bind(Clock.class).toInstance(getClock()));
         modules.addAll(notification.nodeModules());
         modules.addAll(licensing.nodeModules());
         modules.addAll(security.nodeModules());
diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/support/clock/ClockModule.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/support/clock/ClockModule.java
deleted file mode 100644
index b024dbf4dea..00000000000
--- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/support/clock/ClockModule.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-package org.elasticsearch.xpack.support.clock;
-
-import org.elasticsearch.common.inject.AbstractModule;
-
-/**
- *
- */
-public class ClockModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(Clock.class).toInstance(SystemClock.INSTANCE);
-    }
-
-}
diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java
index b2b69c4d284..9159b2a721f 100644
--- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java
+++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/TimeWarpedXPackPlugin.java
@@ -5,43 +5,19 @@
  */
 package org.elasticsearch.xpack;
 
-import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.xpack.support.clock.Clock;
 import org.elasticsearch.xpack.support.clock.ClockMock;
-import org.elasticsearch.xpack.support.clock.ClockModule;
 import org.elasticsearch.xpack.watcher.test.TimeWarpedWatcher;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 public class TimeWarpedXPackPlugin extends XPackPlugin {
-
     public TimeWarpedXPackPlugin(Settings settings) {
         super(settings);
         watcher = new TimeWarpedWatcher(settings);
     }
 
     @Override
-    public Collection<Module> nodeModules() {
-        List<Module> modules = new ArrayList<>(super.nodeModules());
-        for (int i = 0; i < modules.size(); ++i) {
-            Module module = modules.get(i);
-            if (module instanceof ClockModule) {
-                // replacing the clock module so we'll be able
-                // to control time in tests
-                modules.set(i, new MockClockModule());
-            }
-        }
-        return modules;
-    }
-
-    public static class MockClockModule extends ClockModule {
-        @Override
-        protected void configure() {
-            bind(ClockMock.class).asEagerSingleton();
-            bind(Clock.class).to(ClockMock.class);
-        }
+    protected Clock getClock() {
+        return new ClockMock();
     }
 }
diff --git a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/support/clock/ClockMock.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/support/clock/ClockMock.java
index 25ea390ae66..318b01d4c60 100644
--- a/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/support/clock/ClockMock.java
+++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/support/clock/ClockMock.java
@@ -12,7 +12,7 @@ import org.joda.time.DateTimeZone;
 import java.util.concurrent.TimeUnit;
 
 /**
- *
+ * A clock that can be modified for testing.
  */
 public class ClockMock implements Clock {
 
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java
index bc635db8019..b671984c582 100644
--- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java
+++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java
@@ -39,6 +39,7 @@ import org.elasticsearch.test.TestCluster;
 import org.elasticsearch.test.store.MockFSIndexStore;
 import org.elasticsearch.test.transport.AssertingLocalTransport;
 import org.elasticsearch.test.transport.MockTransportService;
+import org.elasticsearch.xpack.support.clock.Clock;
 import org.elasticsearch.xpack.watcher.WatcherLifeCycleService;
 import org.elasticsearch.xpack.watcher.WatcherService;
 import org.elasticsearch.xpack.watcher.WatcherState;
@@ -270,7 +271,7 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase
 
     private void setupTimeWarp() throws Exception {
         if (timeWarped()) {
-            timeWarp = new TimeWarp(getInstanceFromMaster(ScheduleTriggerEngineMock.class), getInstanceFromMaster(ClockMock.class));
+            timeWarp = new TimeWarp(getInstanceFromMaster(ScheduleTriggerEngineMock.class), (ClockMock)getInstanceFromMaster(Clock.class));
         }
     }