diff --git a/api_server/es_1_0/cluster.js b/api_server/es_1_0/cluster.js
index 565b18ab478d31..96282930a14fe2 100644
--- a/api_server/es_1_0/cluster.js
+++ b/api_server/es_1_0/cluster.js
@@ -12,7 +12,14 @@ module.exports = function (api) {
   });
   api.addEndpointDescription('_cluster/health', {
     url_params: {
-      "level": ["indices", "shards"]
+      "local": "__flag__",
+      "level": ["indices", "shards"],
+      "master_timeout": "30s",
+      "timeout": "30s",
+      "wait_for_status": ["yellow", "green"],
+      "wait_for_relocating_shards": 0,
+      "wait_for_active_shards": 0,
+      "wait_for_nodes": 0
     }
   });
   api.addEndpointDescription('_cluster/pending_tasks');
diff --git a/api_server/es_2_0/cluster.js b/api_server/es_2_0/cluster.js
index 7f0ef15e867b96..a6519e81ed6e4c 100644
--- a/api_server/es_2_0/cluster.js
+++ b/api_server/es_2_0/cluster.js
@@ -12,7 +12,14 @@ module.exports = function (api) {
   });
   api.addEndpointDescription('_cluster/health', {
     url_params: {
-      "level": ["indices", "shards"]
+      "local": "__flag__",
+      "level": ["indices", "shards"],
+      "master_timeout": "30s",
+      "timeout": "30s",
+      "wait_for_status": ["yellow", "green"],
+      "wait_for_relocating_shards": 0,
+      "wait_for_active_shards": 0,
+      "wait_for_nodes": 0
     }
   });
   api.addEndpointDescription('_cluster/pending_tasks');