diff --git a/watcher/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java b/watcher/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java
index 13f1457c1b3..ac7fcbab883 100644
--- a/watcher/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java
+++ b/watcher/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java
@@ -18,7 +18,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
-import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
@@ -316,6 +315,7 @@ public class SearchInputTests extends ESIntegTestCase {
         assertThat(names, arrayContaining("test", "test-" + DateTimeFormat.forPattern(dateFormat).print(now.minusDays(1))));
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/484")
     @Test(expected = ElasticsearchParseException.class)
     public void testParser_ScanNotSupported() throws Exception {
         SearchRequest request = client().prepareSearch()
diff --git a/watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java b/watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java
index c52cf356393..ded197c8d8e 100644
--- a/watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java
+++ b/watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java
@@ -20,7 +20,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
-import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
@@ -364,6 +363,7 @@ public class SearchTransformTests extends ESIntegTestCase {
         assertThat(names, arrayContaining("idx", "idx-" + DateTimeFormat.forPattern(dateFormat).print(now.minusDays(3))));
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/484")
     @Test(expected = ElasticsearchParseException.class)
     public void testParser_ScanNotSupported() throws Exception {
         SearchRequest request = client().prepareSearch()