diff --git a/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherIndexingListenerTests.java b/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherIndexingListenerTests.java
index 9483ee2fc0a..582ef6abe1e 100644
--- a/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherIndexingListenerTests.java
+++ b/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherIndexingListenerTests.java
@@ -655,20 +655,6 @@ public class WatcherIndexingListenerTests extends ESTestCase {
         assertThat(listener.getConfiguration(), is(INACTIVE));
     }
 
-    public void testThatIndexingListenerIsInactiveWhenWatchExecutionIsNotDistributed() throws Exception {
-        listener.setConfiguration(INACTIVE);
-        Version oldVersion = VersionUtils.randomVersionBetween(random(), Version.V_5_6_0, Version.V_6_0_0_alpha2);
-        DiscoveryNode node = new DiscoveryNode("node_1", ESTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(),
-                new HashSet<>(asList(DiscoveryNode.Role.values())), oldVersion);
-
-        ClusterState state = ClusterState.builder(new ClusterName("my-cluster"))
-                .nodes(new DiscoveryNodes.Builder().masterNodeId("node_1").localNodeId("node_1").add(node))
-                .build();
-        listener.clusterChanged(new ClusterChangedEvent("something", state, state));
-
-        assertThat(listener.getConfiguration(), is(INACTIVE));
-    }
-
     public void testThatIndexingListenerBecomesInactiveWithoutMasterNode() {
         ClusterState clusterStateWithMaster = mockClusterState(Watch.INDEX);
         ClusterState clusterStateWithoutMaster = mockClusterState(Watch.INDEX);
diff --git a/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java b/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java
index 4e105803ea9..d8816ee3361 100644
--- a/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java
+++ b/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherLifeCycleServiceTests.java
@@ -468,29 +468,6 @@ public class WatcherLifeCycleServiceTests extends ESTestCase {
         verify(watcherService, never()).start(any(ClusterState.class));
     }
 
-    public void testWatcherStartsOnlyOnMasterWhenOldNodesAreInCluster() throws Exception {
-        DiscoveryNodes nodes = new DiscoveryNodes.Builder()
-                .masterNodeId("node_1").localNodeId("node_1")
-                .add(newNode("node_1"))
-                .add(newNode("node_2"))
-                .add(newNode("oldNode", VersionUtils.randomVersionBetween(random(), Version.V_5_5_0, Version.V_6_0_0_alpha2)))
-                .build();
-
-        ClusterState state = ClusterState.builder(new ClusterName("my-cluster"))
-                .nodes(nodes)
-                .metaData(MetaData.builder()
-                        .put(IndexTemplateMetaData.builder(HISTORY_TEMPLATE_NAME).patterns(randomIndexPatterns()))
-                        .put(IndexTemplateMetaData.builder(TRIGGERED_TEMPLATE_NAME).patterns(randomIndexPatterns()))
-                        .put(IndexTemplateMetaData.builder(WATCHES_TEMPLATE_NAME).patterns(randomIndexPatterns()))
-                        .build())
-                .build();
-        when(watcherService.validate(eq(state))).thenReturn(true);
-        when(watcherService.state()).thenReturn(WatcherState.STOPPED);
-
-        lifeCycleService.clusterChanged(new ClusterChangedEvent("any", state, state));
-        verify(watcherService).start(any(ClusterState.class));
-    }
-
     public void testWatcherServiceDoesNotStartIfIndexTemplatesAreMissing() throws Exception {
         DiscoveryNodes nodes = new DiscoveryNodes.Builder()
                 .masterNodeId("node_1").localNodeId("node_1")