diff --git a/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/10_basic.yaml b/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/10_basic.yaml
index 5649c222663..884369fac23 100644
--- a/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/10_basic.yaml
+++ b/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/10_basic.yaml
@@ -18,8 +18,8 @@
                   "indices" : [ "logstash*" ],
                   "body" : {
                     "query" : {
-                      "filtered": {
-                        "query": {
+                      "bool": {
+                        "must" : {
                           "match": {
                             "response": 404
                           }
diff --git a/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml b/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml
index 62a685d1105..36826ce1ac1 100644
--- a/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml
+++ b/qa/smoke-test-watcher-with-groovy/rest-api-spec/test/watcher_groovy/30_inline_watch.yaml
@@ -29,8 +29,8 @@
                     "indices" : [ "logstash*" ],
                     "body" : {
                       "query" : {
-                        "filtered": {
-                          "query": {
+                        "bool" : {
+                          "must": {
                             "match": {
                               "response": 404
                             }