diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/ScheduleTriggerEngineMock.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/ScheduleTriggerEngineMock.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/ScheduleTriggerEngineMock.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/ScheduleTriggerEngineMock.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/CronScheduleTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/CronScheduleTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/CronScheduleTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/CronScheduleTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/DailyScheduleTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/DailyScheduleTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/DailyScheduleTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/DailyScheduleTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/HourlyScheduleTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/HourlyScheduleTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/HourlyScheduleTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/HourlyScheduleTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/IntervalScheduleTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/IntervalScheduleTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/IntervalScheduleTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/IntervalScheduleTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/MonthlyScheduleTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/MonthlyScheduleTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/MonthlyScheduleTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/MonthlyScheduleTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleRegistryTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleRegistryTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleRegistryTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleRegistryTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleTestCase.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleTestCase.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleTestCase.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleTestCase.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleTriggerEventTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleTriggerEventTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleTriggerEventTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/ScheduleTriggerEventTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/WeeklyScheduleTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/WeeklyScheduleTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/WeeklyScheduleTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/WeeklyScheduleTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/YearlyScheduleTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/YearlyScheduleTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/YearlyScheduleTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/YearlyScheduleTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/BaseTriggerEngineTestCase.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/BaseTriggerEngineTestCase.java
similarity index 98%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/BaseTriggerEngineTestCase.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/BaseTriggerEngineTestCase.java
index a4fb4f988c8..4d5dbb303d6 100644
--- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/BaseTriggerEngineTestCase.java
+++ b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/BaseTriggerEngineTestCase.java
@@ -26,8 +26,6 @@ import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.xpack.trigger.schedule.Schedules.hourly;
-import static org.elasticsearch.xpack.trigger.schedule.Schedules.interval;
 import static org.hamcrest.Matchers.is;
 import static org.joda.time.DateTimeZone.UTC;
 
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/SchedulerScheduleEngineTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/SchedulerScheduleEngineTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/SchedulerScheduleEngineTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/SchedulerScheduleEngineTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/TickerScheduleEngineTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/TickerScheduleEngineTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/TickerScheduleEngineTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/engine/TickerScheduleEngineTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/tool/CronEvalToolTests.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/tool/CronEvalToolTests.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/tool/CronEvalToolTests.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/tool/CronEvalToolTests.java
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/tool/EvalCron.java b/elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/tool/EvalCron.java
similarity index 100%
rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/trigger/schedule/tool/EvalCron.java
rename to elasticsearch/x-pack/src/test/java/org/elasticsearch/xpack/trigger/schedule/tool/EvalCron.java