diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml
index 002dfa2c0a5..528a55abc33 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml
@@ -2,7 +2,7 @@
 "Basic array_compare watch":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
 
   - do: {watcher.stats:{}}
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/delete_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/delete_watch/10_basic.yaml
index e0afb4da963..0867c419293 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/delete_watch/10_basic.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/delete_watch/10_basic.yaml
@@ -2,7 +2,7 @@
 "Test delete watch api":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do:
       watcher.put_watch:
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/10_basic.yaml
index 557191c8589..e21a90b5da3 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/10_basic.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/10_basic.yaml
@@ -2,7 +2,7 @@
 "Test get watch api":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do:
       watcher.put_watch:
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/20_missing.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/20_missing.yaml
index 867d376156d..aff4b65cd34 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/20_missing.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/get_watch/20_missing.yaml
@@ -2,7 +2,7 @@
 "Test get watch api with missing watch":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
 
   - do:
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/getting_started/10_monitor_cluster_health.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/getting_started/10_monitor_cluster_health.yaml
index ee0eb71c6b8..95190135d12 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/getting_started/10_monitor_cluster_health.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/getting_started/10_monitor_cluster_health.yaml
@@ -2,7 +2,7 @@
 "Getting started - Monitor cluster health":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
 
   - do: {watcher.stats:{}}
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/hijack/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/hijack/10_basic.yaml
index a176309a7bd..ddf39ad9aac 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/hijack/10_basic.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/hijack/10_basic.yaml
@@ -2,7 +2,7 @@
 "Test Hijack and Block Direct Access to Internal Indices":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do:
       catch: /not supported/
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/10_basic.yaml
index aa8a328505c..2b6f679ad62 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/10_basic.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/10_basic.yaml
@@ -2,7 +2,7 @@
 "Test put watch api":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do:
       watcher.put_watch:
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/20_put_watch_with_throttle_period.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/20_put_watch_with_throttle_period.yaml
index 380a0dca21b..77159c26a5b 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/20_put_watch_with_throttle_period.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/20_put_watch_with_throttle_period.yaml
@@ -2,7 +2,7 @@
 "Test put watch api with watch level throttle":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do:
       watcher.put_watch:
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml
index 596d5e0efd4..227e2ff4141 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/30_put_watch_with_action_throttle_period.yaml
@@ -2,7 +2,7 @@
 "Test put watch api with action level throttle period":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do:
       watcher.put_watch:
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/40_put_watch_as_inactive.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/40_put_watch_as_inactive.yaml
index 72fa737df70..fbae8034698 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/40_put_watch_as_inactive.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/put_watch/40_put_watch_as_inactive.yaml
@@ -2,7 +2,7 @@
 "Test put inactive watch":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do:
       watcher.put_watch:
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/restart_watcher/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/restart_watcher/10_basic.yaml
index dee6b7fa5b2..ffd5cf88c62 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/restart_watcher/10_basic.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/restart_watcher/10_basic.yaml
@@ -2,7 +2,7 @@
 "Test restart watcher api":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do: {watcher.restart: {}}
   - match: { acknowledged: true }
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/start_watcher/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/start_watcher/10_basic.yaml
index 1f028099aae..d3d25ae1ea7 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/start_watcher/10_basic.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/start_watcher/10_basic.yaml
@@ -2,7 +2,7 @@
 "Test start watcher api":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do: {watcher.start: {}}
   - match: { acknowledged: true }
diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stop_watcher/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stop_watcher/10_basic.yaml
index e9179efc7e5..a4bac7b78a1 100644
--- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stop_watcher/10_basic.yaml
+++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/stop_watcher/10_basic.yaml
@@ -2,7 +2,7 @@
 "Test stop watcher api":
   - do:
       cluster.health:
-          wait_for_status: green
+          wait_for_status: yellow
 
   - do: {watcher.stop: {}}
   - match: { acknowledged: true }