From 8b0a74f11c217b480a3e45d9806470f707a86d7f Mon Sep 17 00:00:00 2001
From: Nhat Nguyen <nhat.nguyen@elastic.co>
Date: Thu, 18 Apr 2019 14:19:31 -0400
Subject: [PATCH] Clean up outdated skip statements in yaml tests (#41165)

These skip statements become no-ops in 8.0 for we don't support
a mixed cluster between 6.x and 8.0.

Relates #41164
---
 .../test/analysis-common/20_analyzers.yml     |  3 --
 .../test/analysis-common/30_tokenizers.yml    |  3 --
 .../test/analysis-common/40_token_filters.yml |  4 --
 .../test/indices.analyze/10_analyze.yml       |  3 +-
 .../test/lang_mustache/30_search_template.yml |  4 --
 .../50_multi_search_template.yml              |  4 --
 .../rest-api-spec/test/painless/30_search.yml |  4 --
 .../test/painless/70_mov_fn_agg.yml           |  3 --
 .../test/painless/80_script_score.yml         |  5 ---
 .../painless/90_interval_query_filter.yml     |  4 --
 .../test/rank_feature/10_basic.yml            |  4 --
 .../test/rank_features/10_basic.yml           |  4 --
 .../resources/rest-api-spec/test/10_basic.yml |  5 ---
 .../rest-api-spec/test/rank_eval/10_basic.yml | 15 -------
 .../rest-api-spec/test/rank_eval/20_dcg.yml   |  5 ---
 .../test/rank_eval/30_failures.yml            |  5 ---
 .../test/rank_eval/40_rank_eval_templated.yml |  5 ---
 .../test/delete_by_query/10_basic.yml         |  4 --
 .../test/update_by_query/10_basic.yml         |  3 --
 .../test/analysis_icu/10_basic.yml            |  1 -
 .../test/mapper_annotatedtext/10_basic.yml    |  8 ----
 .../test/multi_cluster/20_info.yml            |  4 --
 .../test/ingest/20_combine_processors.yml     |  5 ---
 .../rest-api-spec/test/bulk/60_deprecated.yml |  5 ---
 .../rest-api-spec/test/bulk/80_cas.yml        |  5 ---
 .../rest-api-spec/test/index/30_cas.yml       |  5 ---
 .../test/index/70_mix_typeless_typeful.yml    | 10 -----
 .../test/indices.clear_cache/10_basic.yml     |  4 --
 .../20_mix_typeless_typeful.yml               | 20 ---------
 .../test/indices.get_alias/30_wildcards.yml   | 18 --------
 .../test/indices.get_mapping/10_basic.yml     |  3 --
 .../indices.get_mapping/30_missing_index.yml  |  3 --
 .../50_wildcard_expansion.yml                 |  6 ---
 .../test/indices.get_settings/30_defaults.yml |  3 --
 .../test/indices.get_template/10_basic.yml    |  3 --
 .../test/indices.put_mapping/10_basic.yml     | 11 -----
 .../20_mix_typeless_typeful.yml               |  6 ---
 .../indices.put_mapping/all_path_options.yml  |  3 --
 .../30_max_size_condition.yml                 |  4 --
 .../test/indices.rollover/40_mapping.yml      |  8 ----
 .../test/indices.split/10_basic.yml           | 10 -----
 .../test/indices.split/20_source_mapping.yml  |  4 --
 .../test/indices.split/30_copy_settings.yml   |  4 --
 .../test/scroll/20_keep_alive.yml             |  3 --
 .../200_top_hits_metric.yml                   |  4 --
 .../test/search.aggregation/230_composite.yml | 39 -----------------
 .../search.aggregation/240_max_buckets.yml    |  4 --
 .../test/search.aggregation/250_moving_fn.yml |  5 ---
 .../search.aggregation/260_weighted_avg.yml   |  3 --
 .../270_median_absolute_deviation_metric.yml  |  3 --
 .../30_max_analyzed_offset.yml                | 16 ++-----
 .../test/search/170_terms_query.yml           |  3 --
 .../test/search/190_index_prefix_search.yml   | 10 -----
 .../test/search/200_ignore_malformed.yml      |  3 --
 .../test/search/200_index_phrase_search.yml   |  4 +-
 .../test/search/210_rescore_explain.yml       |  3 --
 .../50_completion_with_multi_fields.yml       | 20 ---------
 .../test/update/35_if_seq_no.yml              |  5 ---
 .../rest-api-spec/test/graph/10_basic.yml     |  3 --
 .../test/indices.freeze/10_basic.yml          | 10 -----
 .../test/rollup/get_rollup_index_caps.yml     |  4 --
 .../rest-api-spec/test/rollup/stop_job.yml    |  8 ----
 .../rest-api-spec/test/sql/translate.yml      |  4 --
 .../80_put_get_watch_with_passwords.yml       |  4 --
 .../test/watcher/stats/10_basic.yml           |  9 ----
 .../test/rankeval/10_rankeval.yml             |  5 ---
 .../test/old_cluster/30_ml_jobs_crud.yml      | 42 -------------------
 .../test/mustache/30_search_input.yml         |  7 ----
 .../rest-api-spec/test/painless/10_basic.yml  |  4 --
 69 files changed, 6 insertions(+), 459 deletions(-)

diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml
index fe5b997974ad1..15de6fe664786 100644
--- a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml
+++ b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml
@@ -69,9 +69,6 @@
 
 ---
 "standard_html_strip":
-    - skip:
-        version: " - 6.99.99"
-        reason:  only starting from version 7.x this throws an error
     - do:
         catch: /\[standard_html_strip\] analyzer is not supported for new indices, use a custom analyzer using \[standard\] tokenizer and \[html_strip\] char_filter, plus \[lowercase\] filter/
         indices.analyze:
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
index 4fe5162e68743..26c699f447986 100644
--- a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
+++ b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
@@ -141,9 +141,6 @@
 
 ---
 "ngram_exception":
-    - skip:
-        version: " - 6.99.99"
-        reason: only starting from version 7.x this throws an error
     - do:
         catch: /The difference between max_gram and min_gram in NGram Tokenizer must be less than or equal to[:] \[1\] but was \[2\]\. This limit can be set by changing the \[index.max_ngram_diff\] index level setting\./
         indices.analyze:
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml
index d6fe6b9a980e4..3ce4b6bc04ed3 100644
--- a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml
+++ b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml
@@ -1137,10 +1137,6 @@
 
 ---
 "delimited_payload_filter_error":
-    - skip:
-        version: " - 6.99.99"
-        reason:  using delimited_payload_filter throws error from 7.0 on
-
     - do:
         catch: /\[delimited_payload_filter\] is not supported for new indices, use \[delimited_payload\] instead/
         indices.create:
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
index 56bbed7044e14..baa32662b577f 100644
--- a/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
+++ b/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
@@ -17,8 +17,7 @@
 ---
 "htmlStrip_deprecated":
     - skip:
-        version: " - 6.2.99"
-        reason: deprecated in 6.3
+        reason: deprecated
         features: "warnings"
 
     - do:
diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml
index bc039a5ba7c50..c0cc784250b90 100644
--- a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml
+++ b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml
@@ -128,10 +128,6 @@
 
 ---
 "Test with new response format":
-  - skip:
-      version: " - 6.99.99"
-      reason: hits.total is returned as an object in 7.0.0
-
   - do:
       index:
         index:  test
diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml
index a5072d529b9b5..f339731ad130f 100644
--- a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml
+++ b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml
@@ -166,10 +166,6 @@ setup:
 
 ---
 "Test with rest_total_hits_as_int":
-  - skip:
-      version: " - 6.99.99"
-      reason: hits.total is returned as an object in 7.0.0
-
   - do:
       put_script:
         id: stored_template_1
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml
index 0ce1e369cb7c5..a006fde630716 100644
--- a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml
+++ b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml
@@ -452,10 +452,6 @@
 ---
 
 "Exception on negative score":
-    - skip:
-        version: " - 6.99.99"
-        reason: "check on negative scores was added from 7.0.0 on"
-
     - do:
         index:
             index: test
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml
index c2fb38611a30d..a19738732472d 100644
--- a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml
+++ b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml
@@ -1,9 +1,6 @@
 # Sanity integration test to make sure the custom context and whitelist work for moving_fn pipeline agg
 #
 setup:
-  - skip:
-        version: " - 6.3.99"
-        reason:  "moving_fn added in 6.4.0"
   - do:
       indices.create:
         index: test
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml
index cf55810058d92..05b094df94891 100644
--- a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml
+++ b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml
@@ -1,10 +1,5 @@
 # Integration tests for ScriptScoreQuery using Painless
 
-setup:
-- skip:
-    version: " - 6.99.99"
-    reason: "script score query was introduced in 7.0.0"
-
 ---
 "Math functions":
     - do:
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml
index 0a6cf993e2a2e..7db3eb8b9b2aa 100644
--- a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml
+++ b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason:  "Implemented in 7.0"
-
   - do:
       indices.create:
         index:  test
diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml
index 8a874d30591f6..6fea35eb21f4e 100644
--- a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml
+++ b/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: "The rank feature field/query was introduced in 7.0.0"
-
   - do:
       indices.create:
           index: test
diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml
index f524bd93bb600..d4d5d2a360406 100644
--- a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml
+++ b/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: "The rank_features field was introduced in 7.0.0"
-
   - do:
       indices.create:
           index: test
diff --git a/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml b/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml
index 08d344687adc7..4d01600f76e43 100644
--- a/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml
+++ b/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml
@@ -1,10 +1,5 @@
 ---
 "Test percolator basics via rest":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
   - do:
       indices.create:
         index: queries_index
diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/10_basic.yml b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/10_basic.yml
index b9001cb782a80..14279bbb5270f 100644
--- a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/10_basic.yml
+++ b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/10_basic.yml
@@ -40,11 +40,6 @@ setup:
 
 ---
 "Response format":
-
-  - skip:
-      version: " - 6.2.99"
-      reason: response format was updated in 6.3
-
   - do:
       rank_eval:
         index: foo,
@@ -120,11 +115,6 @@ setup:
 
 ---
 "Mean Reciprocal Rank":
-
-  - skip:
-      version: " - 6.2.99"
-      reason: response format was updated in 6.3
-
   - do:
       rank_eval:
         body: {
@@ -159,11 +149,6 @@ setup:
 
 ---
 "Expected Reciprocal Rank":
-
-  - skip:
-      version: " - 6.3.99"
-      reason: ERR was introduced in 6.4
-
   - do:
       rank_eval:
         body: {
diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/20_dcg.yml b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/20_dcg.yml
index 90094baabb9db..82005efcebe18 100644
--- a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/20_dcg.yml
+++ b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/20_dcg.yml
@@ -1,10 +1,5 @@
 ---
 "Response format":
-
-  - skip:
-      version: " - 6.1.99"
-      reason: the ranking evaluation feature is available since 6.2
-
   - do:
       index:
         index:   foo
diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/30_failures.yml b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/30_failures.yml
index b9f55ed12ad7e..c88a769b8687b 100644
--- a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/30_failures.yml
+++ b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/30_failures.yml
@@ -1,10 +1,5 @@
 ---
 "Response format":
-
-  - skip:
-      version: " - 6.2.99"
-      reason: response format was updated in 6.3
-
   - do:
       index:
         index:   foo
diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml
index 57d5aa5642ef6..08897e17ef900 100644
--- a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml
+++ b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml
@@ -48,11 +48,6 @@ setup:
 
 ---
 "Basic rank-eval request with template":
-
-  - skip:
-      version: " - 6.1.99"
-      reason: the ranking evaluation feature is available since 6.2
-
   - do:
       rank_eval:
         body: {
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml
index d11f160bcf571..ded91a095f611 100644
--- a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml
+++ b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml
@@ -145,10 +145,6 @@
 
 ---
 "Response for version conflict (seq no powered)":
-  - skip:
-      version: " - 6.6.99"
-      reason: reindex moved to rely on sequence numbers for concurrency control
-
   - do:
       indices.create:
         index: test
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml
index 08c8465c40960..40119f22abb5b 100644
--- a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml
+++ b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml
@@ -116,9 +116,6 @@
 
 ---
 "Response for version conflict (seq no powered)":
-  - skip:
-      version: " - 6.6.99"
-      reason: reindex moved to rely on sequence numbers for concurrency control
   - do:
       indices.create:
         index: test
diff --git a/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yml b/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yml
index 5cdfcde72b020..da95501c05d21 100644
--- a/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yml
+++ b/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yml
@@ -107,7 +107,6 @@
 ---
 "Normalization with deprecated unicodeSetFilter":
     - skip:
-        version: " - 6.99.99"
         reason:  unicodeSetFilter deprecated in 7.0.0, replaced by unicode_set_filter
         features: "warnings"
 
diff --git a/plugins/mapper-annotated-text/src/test/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml b/plugins/mapper-annotated-text/src/test/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml
index 63516516252a9..aca6ba3059381 100644
--- a/plugins/mapper-annotated-text/src/test/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml
+++ b/plugins/mapper-annotated-text/src/test/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml
@@ -3,10 +3,6 @@
 
 ---
 "annotated highlighter on annotated text":
-  - skip:
-      version: " - 6.4.99"
-      reason: Annotated text type introduced in 6.5.0
-
   - do:
       indices.create:
         index: annotated
@@ -45,10 +41,6 @@
 
 ---
 "issue 39395 thread safety issue -requires multiple calls to reveal":
-  - skip:
-      version: " - 6.4.99"
-      reason: Annotated text type introduced in 6.5.0
-
   - do:
       indices.create:
         index: annotated
diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
index 1b0f9830e26db..59657e2012c8a 100644
--- a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
+++ b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
@@ -61,10 +61,6 @@
 
 ---
 "skip_unavailable is returned as part of _remote/info response":
-  - skip:
-      version: " - 6.0.99"
-      reason: "skip_unavailable is only returned from 6.1.0 on"
-
   - do:
       cluster.get_settings:
         include_defaults: true
diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yml b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yml
index c121d542c86b1..0c0cf816b000d 100644
--- a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yml
+++ b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yml
@@ -1,10 +1,5 @@
 ---
 "Test with date processor":
-  - skip:
-      version: " - 6.9.99"
-      reason: pre-7.0.0 requires the 8 prefix for Java time formats, so would treat the format in this test as a Joda time format
-      features: "warnings"
-
   - do:
       ingest.put_pipeline:
         id: "_id"
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/60_deprecated.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/60_deprecated.yml
index 1401fcc086208..c04f749d0bd10 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/60_deprecated.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/60_deprecated.yml
@@ -2,11 +2,6 @@
 ---
 "Deprecated parameters should fail in Bulk query":
 
-   - skip:
-       version: " - 6.99.99"
-       reason:  some parameters are removed starting from 7.0, their equivalents without underscore are used instead
-       features: "warnings"
-
    - do:
        catch:  bad_request
        bulk:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/80_cas.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/80_cas.yml
index 902621cfba578..87d3d237d42cb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/80_cas.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/80_cas.yml
@@ -1,10 +1,5 @@
 ---
 "Compare And Swap Sequence Numbers":
-
- - skip:
-      version: " - 6.99.99"
-      reason:  typeless API are add in 7.0.0
-
  - do:
       index:
           index:  test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/30_cas.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/30_cas.yml
index 550582e9816eb..27534131782a5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/30_cas.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/30_cas.yml
@@ -1,10 +1,5 @@
 ---
 "Compare And Swap Sequence Numbers":
-
- - skip:
-      version: " - 6.99.99"
-      reason:  typesless api was introduces in 7.0
-
  - do:
       index:
           index:  test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/70_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/70_mix_typeless_typeful.yml
index f3629fbb7cc18..9770137cc6f5a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/70_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/70_mix_typeless_typeful.yml
@@ -1,10 +1,5 @@
 ---
 "Index with typeless API on an index that has types":
-
- - skip:
-      version: " - 6.99.99"
-      reason:  Typeless APIs were introduced in 7.0.0
-
  - do:
       indices.create: # not using include_type_name: false on purpose
           include_type_name: true
@@ -64,11 +59,6 @@
 
 ---
 "Index call that introduces new field mappings":
-
-  - skip:
-      version: " - 6.99.99"
-      reason:  Typeless APIs were introduced in 7.0.0
-
   - do:
       indices.create: # not using include_type_name: false on purpose
         include_type_name: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml
index 099226e41e6d3..94b23fb63adb5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml
@@ -11,10 +11,6 @@
 
 ---
 "clear_cache with fielddata set to true":
-  - skip:
-      version: " - 6.2.99"
-      reason: fielddata was deprecated before 6.3.0
-
   - do:
       indices.clear_cache:
         fielddata: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml
index a05134866628b..e4fedae6d1aa5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml
@@ -1,10 +1,5 @@
 ---
 "Create a typeless index while there is a typed template":
-
- - skip:
-      version: " - 6.6.99"
-      reason: Merging typeless/typed mappings/templates was added in 6.7
-
  - do:
       indices.put_template:
           include_type_name: true
@@ -38,11 +33,6 @@
 
 ---
 "Create a typed index while there is a typeless template":
-
- - skip:
-      version: " - 6.6.99"
-      reason: Merging typeless/typed mappings/templates was added in 6.7
-
  - do:
       indices.put_template:
           include_type_name: false
@@ -77,11 +67,6 @@
 
 ---
 "Implicitly create a typed index while there is a typeless template":
-
- - skip:
-      version: " - 6.99.99"
-      reason: include_type_name only supported as of 6.7
-
  - do:
       indices.put_template:
           include_type_name: false
@@ -102,11 +87,6 @@
 
 ---
 "Implicitly create a typeless index while there is a typed template":
-
- - skip:
-      version: " - 6.99.99"
-      reason: needs typeless index operations to work on typed indices
-
  - do:
       indices.put_template:
           include_type_name: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/30_wildcards.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/30_wildcards.yml
index 08b3009be0e88..389166a03136e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/30_wildcards.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/30_wildcards.yml
@@ -26,9 +26,6 @@ setup:
 
 ---
 "Get aliases wildcard and simple exclusion":
-  - skip:
-      version: " - 6.99.99"
-      reason: Exclusions in the alias expression are not handled
   - do:
       indices.get_alias:
         name: test_blias_2,test_alias*,-test_alias_1
@@ -41,9 +38,6 @@ setup:
 
 ---
 "Get aliases and wildcard exclusion":
-  - skip:
-      version: " - 6.99.99"
-      reason: Exclusions in the alias expression are not handled
   - do:
       indices.get_alias:
         name: test_alias_1,test_blias_1,-test_alias*
@@ -66,9 +60,6 @@ setup:
 
 ---
 "Non-existent exclusion alias before wildcard returns 404":
-  - skip:
-      version: " - 6.99.99"
-      reason: Exclusions in the alias expression are not handled
   - do:
       catch: missing
       indices.get_alias:
@@ -97,9 +88,6 @@ setup:
 
 ---
 "Missing exclusions does not fire 404":
-  - skip:
-      version: " - 6.99.99"
-      reason: Exclusions in the alias expression are not handled
   - do:
       indices.get_alias:
         name: test_alias*,-non-existent,test_blias*,-test
@@ -112,9 +100,6 @@ setup:
 
 ---
 "Exclusion of non wildcarded aliases":
-  - skip:
-      version: " - 6.99.99"
-      reason: Exclusions in the alias expression are not handled
   - do:
       indices.get_alias:
         name: test_alias_1,test_blias_2,-test_alias*,-test_blias_2
@@ -123,9 +108,6 @@ setup:
 
 ---
 "Wildcard exclusions does not trigger 404":
-  - skip:
-      version: " - 6.99.99"
-      reason: Exclusions in the alias expression are not handled
   - do:
       catch: missing
       indices.get_alias:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml
index c3addd95469d4..e46f67326a8d2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml
@@ -1,8 +1,5 @@
 ---
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: include_type_name defaults to true before 7.0
   - do:
         indices.create:
           index: test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/30_missing_index.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/30_missing_index.yml
index 5a7624265ecc9..be3acc433ac8f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/30_missing_index.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/30_missing_index.yml
@@ -14,9 +14,6 @@
 
 ---
 "Index missing, ignore_unavailable=true":
-  - skip:
-      version: " - 6.99.99"
-      reason: ignore_unavailable was ignored in previous versions
   - do:
       indices.get_mapping:
         index: test_index
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml
index d3f15b3292285..7f6f3999c868d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml
@@ -102,9 +102,6 @@ setup:
 
 ---
 "Get test-* with wildcard_expansion=none":
- - skip:
-    version: " - 6.99.99"
-    reason: allow_no_indices (defaults to true) was ignored in previous versions
  - do:
     indices.get_mapping:
         index: test-x*
@@ -113,9 +110,6 @@ setup:
  - match: { '':  {} }
 ---
 "Get test-* with wildcard_expansion=none allow_no_indices=false":
- - skip:
-    version: " - 6.99.99"
-    reason: allow_no_indices was ignored in previous versions
  - do:
     catch: missing
     indices.get_mapping:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/30_defaults.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/30_defaults.yml
index 2e3f4af03ebef..83e77140facbc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/30_defaults.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/30_defaults.yml
@@ -10,9 +10,6 @@ setup:
         index: test-index
 ---
 Test retrieval of default settings:
-  - skip:
-      version: " - 6.3.99"
-      reason: include_defaults will not work in mixed-mode clusters containing nodes pre-6.4
   - do:
       indices.get_settings:
         flat_settings: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yml
index c1aac94bf1d84..9becbd54a3773 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yml
@@ -1,7 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: include_type_name defaults to true before 7.0.0
   - do:
       indices.put_template:
         name: test
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml
index 2c4658afad2db..959e08d75dabf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml
@@ -1,8 +1,5 @@
 ---
 "Test Create and update mapping":
-  - skip:
-      version: " - 6.99.99"
-      reason: include_type_name defaults to true before 7.0
   - do:
       indices.create:
         index: test_index
@@ -53,10 +50,6 @@
 
 ---
 "Create index with invalid mappings":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: include_type_name defaults to true before 7.0
   - do:
       indices.create:
         index: test_index
@@ -71,10 +64,6 @@
 
 ---
 "Put mappings with explicit _doc type":
-  - skip:
-      version: " - 6.99.99"
-      reason: include_type_name defaults to true before 7.0
-
   - do:
       indices.create:
         index: test_index
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/20_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/20_mix_typeless_typeful.yml
index 13cb3321841cf..e91ea9210d897 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/20_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/20_mix_typeless_typeful.yml
@@ -53,12 +53,6 @@
 
 ---
 "PUT mapping with _doc on an index that has types":
-
- - skip:
-      version: " - 6.6.99"
-      reason: include_type_name is only supported as of 6.7
-
-
  - do:
       indices.create:
           include_type_name: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/all_path_options.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/all_path_options.yml
index 182ec017e0d30..ad80a61f1763b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/all_path_options.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/all_path_options.yml
@@ -1,7 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: include_type_name defaults to true before 7.0
   - do:
       indices.create:
         index: test_index1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/30_max_size_condition.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/30_max_size_condition.yml
index 6e4df0f292915..08bae450ea756 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/30_max_size_condition.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/30_max_size_condition.yml
@@ -1,10 +1,6 @@
 ---
 "Rollover with max_size condition":
 
-  - skip:
-      version: " - 6.0.99"
-      reason: max_size condition is introduced in 6.1.0
-
   # create index with alias and replica
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/40_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/40_mapping.yml
index 47b004326a457..040ffd534c0ab 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/40_mapping.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/40_mapping.yml
@@ -1,9 +1,5 @@
 ---
 "Typeless mapping":
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
-
   - do:
       indices.create:
         index: logs-1
@@ -44,10 +40,6 @@
 
 ---
 "Mappings with explicit _doc type":
-  - skip:
-      version: " - 6.99.99"
-      reason: include_type_name defaults to true before 7.0
-
   - do:
       indices.create:
         index: logs-1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml
index 2baa82ea78842..01d41856fe1ae 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml
@@ -29,11 +29,6 @@ setup:
 
 ---
 "Split index via API":
-  - skip:
-      version: " - 6.9.99"
-      reason: pre-7.0.0 will send warnings
-      features: "warnings"
-
   # make it read-only
   - do:
       indices.put_settings:
@@ -190,11 +185,6 @@ setup:
 
 ---
 "Create illegal split indices":
-  - skip:
-      version: " - 6.9.99"
-      reason: pre-7.0.0 will send warnings
-      features: "warnings"
-
   # try to do an illegal split with number_of_routing_shards set
   - do:
       catch: /illegal_argument_exception/
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/20_source_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/20_source_mapping.yml
index 3740167a0253a..f600b4817fd91 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/20_source_mapping.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/20_source_mapping.yml
@@ -1,9 +1,5 @@
 ---
 "Split index ignores target template mapping":
-  - skip:
-      version: " - 6.9.99"
-      reason: pre-7.0.0 will send warnings
-      features: "warnings"
 
   # create index
   - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml
index df9eae0adf340..ba876b0ec4e11 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/30_copy_settings.yml
@@ -1,9 +1,5 @@
 ---
 "Copy settings during split index":
-  - skip:
-      version: " - 6.9.99"
-      reason: expects warnings that pre-7.0.0 will not send
-      features: [arbitrary_key, warnings]
 
   - do:
       nodes.info:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/20_keep_alive.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/20_keep_alive.yml
index 6217f66c2648e..e3b4dcc46230b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/20_keep_alive.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/20_keep_alive.yml
@@ -10,9 +10,6 @@
 
 ---
 "Max keep alive":
-  - skip:
-      version: " - 6.99.99"
-      reason: search.max_keep_alive was added in 7.0.0
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/200_top_hits_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/200_top_hits_metric.yml
index 11e3d5906d7e9..cde56fa41e3d9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/200_top_hits_metric.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/200_top_hits_metric.yml
@@ -49,10 +49,6 @@ setup:
 
 ---
 "top_hits aggregation with nested documents":
-  - skip:
-          version: " - 6.1.99"
-          reason: "<= 6.1 nodes don't always include index or id in nested top hits"
-
   - do:
       search:
         rest_total_hits_as_int: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml
index 8532b40fbc1e1..4a01da6e6c213 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml
@@ -60,10 +60,6 @@ setup:
 
 ---
 "Simple Composite aggregation":
-  - skip:
-      version: " - 6.0.99"
-      reason:  this uses a new API that has been added in 6.1
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -89,11 +85,6 @@ setup:
 
 ---
 "Nested Composite aggregation":
-  - skip:
-      version: " - 6.0.99"
-      reason:  this uses a new API that has been added in 6.1
-
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -139,11 +130,6 @@ setup:
 
 ---
 "Aggregate After":
-  - skip:
-      version: " - 6.0.99"
-      reason:  this uses a new API that has been added in 6.1
-
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -181,11 +167,6 @@ setup:
 
 ---
 "Aggregate After Missing":
-  - skip:
-      version: " - 6.1.99"
-      reason:  bug fixed in 6.2.0
-
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -212,10 +193,6 @@ setup:
 
 ---
 "Invalid Composite aggregation":
-  - skip:
-      version: " - 6.0.99"
-      reason:  this uses a new API that has been added in 6.1
-
   - do:
       catch:      /\[composite\] aggregation cannot be used with a parent aggregation/
       search:
@@ -241,10 +218,6 @@ setup:
 
 ---
 "Composite aggregation with format":
-  - skip:
-      version: " - 6.2.99"
-      reason:  this uses a new option (format) added in 6.3.0
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -302,10 +275,6 @@ setup:
 
 ---
 "Composite aggregation with after_key in the response":
-  - skip:
-      version: " - 6.2.99"
-      reason:  starting in 6.3.0 after_key is returned in the response
-
   - do:
         search:
           rest_total_hits_as_int: true
@@ -331,10 +300,6 @@ setup:
 
 ---
 "Composite aggregation and array size":
-  - skip:
-      version: " - 6.99.99"
-      reason:  starting in 7.0 the composite aggregation throws an execption if the provided size is greater than search.max_buckets.
-
   - do:
         catch: /.*Trying to create too many buckets.*/
         search:
@@ -357,10 +322,6 @@ setup:
 
 ---
 "Composite aggregation with nested parent":
-  - skip:
-      version: " - 6.99.99"
-      reason:  the ability to set a nested parent aggregation was added in 7.0.
-
   - do:
         search:
           rest_total_hits_as_int: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/240_max_buckets.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/240_max_buckets.yml
index 3dd8d345043c3..981fcbd574b15 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/240_max_buckets.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/240_max_buckets.yml
@@ -75,10 +75,6 @@ setup:
 
 ---
 "Max bucket":
-  - skip:
-      version: " - 6.99.99"
-      reason:  search.max_buckets limit has been added in 7.0
-
   - do:
       cluster.put_settings:
         body:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/250_moving_fn.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/250_moving_fn.yml
index 0a7affd276aea..2bfdf4703307d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/250_moving_fn.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/250_moving_fn.yml
@@ -1,8 +1,3 @@
-setup:
-  - skip:
-        version: " - 6.3.99"
-        reason:  "moving_fn added in 6.4.0"
-
 ---
 "Bad window":
 
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/260_weighted_avg.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/260_weighted_avg.yml
index c5988fc9e5dc4..6b17132c751de 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/260_weighted_avg.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/260_weighted_avg.yml
@@ -1,7 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.3.99"
-      reason: weighted_avg is only available as of 6.4.0
   - do:
       indices.create:
           index: test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/270_median_absolute_deviation_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/270_median_absolute_deviation_metric.yml
index 0cba08fccae9b..03797503436fb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/270_median_absolute_deviation_metric.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/270_median_absolute_deviation_metric.yml
@@ -1,7 +1,4 @@
 setup:
-  - skip:
-        version: " - 6.5.99"
-        reason:  "added in 6.6.0"
   - do:
         indices.create:
             index: test
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml
index 334708b54b066..a9506b053b4ac 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml
@@ -28,9 +28,7 @@ setup:
 
 ---
 "Unified highlighter on a field WITHOUT OFFSETS exceeding index.highlight.max_analyzed_offset should FAIL":
-  - skip:
-      version: " - 6.99.99"
-      reason: index.highlight.max_analyzed_offset setting has been added in 7.0.0
+
   - do:
       catch: bad_request
       search:
@@ -42,9 +40,7 @@ setup:
 
 ---
 "Plain highlighter on a field WITHOUT OFFSETS exceeding index.highlight.max_analyzed_offset should FAIL":
-  - skip:
-      version: " - 6.99.99"
-      reason: index.highlight.max_analyzed_offset setting has been added in 7.0.0
+
   - do:
       catch: bad_request
       search:
@@ -56,9 +52,7 @@ setup:
 
 ---
 "Unified highlighter on a field WITH OFFSETS exceeding index.highlight.max_analyzed_offset should SUCCEED":
-  - skip:
-      version: " - 6.99.99"
-      reason: index.highligt.max_analyzed_offset setting has been added in 7.0.0
+
   - do:
       search:
           rest_total_hits_as_int: true
@@ -69,9 +63,7 @@ setup:
 
 ---
 "Plain highlighter on a field WITH OFFSETS exceeding index.highlight.max_analyzed_offset should FAIL":
-  - skip:
-      version: " - 6.99.99"
-      reason: index.highlight.max_analyzed_offset setting has been added in 7.0.0
+
   - do:
       catch: bad_request
       search:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/170_terms_query.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/170_terms_query.yml
index 89ea24618c68f..82ccb816f2314 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/170_terms_query.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/170_terms_query.yml
@@ -1,8 +1,5 @@
 ---
 "Terms Query with No.of terms exceeding index.max_terms_count should FAIL":
-  - skip:
-      version: " - 6.99.99"
-      reason: index.max_terms_count setting has been added in 7.0.0
   - do:
       indices.create:
           index: test_index
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml
index 40c80b88cfb1b..f667786f557f9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/190_index_prefix_search.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.2.99"
-      reason: index_prefixes is only available as of 6.3.0
-
   - do:
       indices.create:
         index:  test
@@ -27,9 +23,6 @@ setup:
 
 ---
 "search with index prefixes":
-  - skip:
-      version: " - 6.2.99"
-      reason: index_prefixes is only available as of 6.3.0
   - do:
       search:
         rest_total_hits_as_int: true
@@ -85,9 +78,6 @@ setup:
 
 ---
 "search index prefixes with span_multi":
-  - skip:
-      version: " - 6.99.99"
-      reason: span_multi throws an exception with prefix fields on < versions
 
   - do:
       search:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_ignore_malformed.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_ignore_malformed.yml
index 71ddb32302396..162da4fc3c9e5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_ignore_malformed.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_ignore_malformed.yml
@@ -1,8 +1,5 @@
 ---
 setup:
-  - skip:
-      version: " - 6.3.99"
-      reason: _ignored was added in 6.4.0
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_index_phrase_search.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_index_phrase_search.yml
index b48857be4e7a1..d37c0c8cb3f72 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_index_phrase_search.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_index_phrase_search.yml
@@ -1,8 +1,6 @@
 ---
 "search with indexed phrases":
-  - skip:
-      version: " - 6.99.99"
-      reason: index_phrase is only available as of 7.0.0
+
   - do:
       indices.create:
         index:  test
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/210_rescore_explain.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/210_rescore_explain.yml
index 92bb049980dff..4d63a81a99595 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/210_rescore_explain.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/210_rescore_explain.yml
@@ -1,8 +1,5 @@
 ---
 "Score should match explanation in rescore":
-  - skip:
-      version: " - 6.99.99"
-      reason: Explanation for rescoring was corrected after these versions
   - do:
       bulk:
         refresh: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/50_completion_with_multi_fields.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/50_completion_with_multi_fields.yml
index a29019183e199..8e793e4beb6f0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/50_completion_with_multi_fields.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/50_completion_with_multi_fields.yml
@@ -2,10 +2,6 @@
 ---
 "Search by suggestion and by keyword sub-field should work":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  "Search by suggestion with multi-fields was introduced 7.0.0"
-
   - do:
       indices.create:
         index: completion_with_sub_keyword
@@ -64,10 +60,6 @@
 ---
 "Search by suggestion on sub field should work":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  "Search by suggestion with multi-fields was introduced 7.0.0"
-
   - do:
       indices.create:
         index: completion_with_sub_completion
@@ -114,10 +106,6 @@
 ---
 "Search by suggestion on sub field with context should work":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  "Search by suggestion with multi-fields was introduced 7.0.0"
-
   - do:
       indices.create:
         index: completion_with_context
@@ -183,10 +171,6 @@
 ---
 "Search by suggestion on sub field with weight should work":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  "Search by suggestion with multi-fields was introduced 7.0.0"
-
   - do:
       indices.create:
         index: completion_with_weight
@@ -239,10 +223,6 @@
 ---
 "Search by suggestion on geofield-hash on sub field should work":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  "Search by suggestion with multi-fields was introduced 7.0.0"
-
   - do:
       indices.create:
         index: geofield_with_completion
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/35_if_seq_no.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/35_if_seq_no.yml
index f982adf693ad0..318ecd3a7c0ce 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/35_if_seq_no.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/35_if_seq_no.yml
@@ -1,10 +1,5 @@
 ---
 "Update with if_seq_no":
-
- - skip:
-      version: " - 6.6.99"
-      reason: if_seq_no was added in 6.7.0
-
  - do:
       catch:        missing
       update:
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/graph/10_basic.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/graph/10_basic.yml
index c7aa714032f92..6c691f4f60e14 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/test/graph/10_basic.yml
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/graph/10_basic.yml
@@ -15,9 +15,6 @@ setup:
 
 ---
 "Test basic graph explore":
-  - skip:
-      version: " - 6.99.99"
-      reason: "graph endpoints changed in 7.0.0 to not include _xpack in the path but this is not supported in 6.x"
   - do:
       index:
           index:  test_1
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/10_basic.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/10_basic.yml
index 16a0aace0e444..4ba49e53308d2 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/10_basic.yml
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/indices.freeze/10_basic.yml
@@ -1,10 +1,5 @@
 ---
 "Basic":
-
-- skip:
-    version: " - 6.99.99"
-    reason: types are required in requests before 7.0.0
-
 - do:
     index:
       index: test
@@ -84,11 +79,6 @@
 
 ---
 "Test index options":
-
-- skip:
-    version: " - 6.99.99"
-    reason: types are required in requests before 7.0.0
-
 - do:
     index:
       index: test
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/get_rollup_index_caps.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/get_rollup_index_caps.yml
index e4b98b9492087..c666663ad760e 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/get_rollup_index_caps.yml
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/get_rollup_index_caps.yml
@@ -290,10 +290,6 @@ setup:
 ---
 "Verify job caps by rollup index comma delimited list":
 
-- skip:
-    version: " - 6.99.99"
-    reason: "comma delimited index support was fixed in 7.0"
-
 - do:
     headers:
       Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/stop_job.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/stop_job.yml
index 7e8b6b3f61af0..db15be229214c 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/stop_job.yml
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/stop_job.yml
@@ -85,10 +85,6 @@ setup:
 
 ---
 "Test wait_for_completion default timeout":
-  - skip:
-      version: " - 6.5.99"
-      reason: wait_for_completion option was added in 6.6
-
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
@@ -106,10 +102,6 @@ setup:
 
 ---
 "Test wait_for_completion with custom timeout":
-  - skip:
-      version: " - 6.5.99"
-      reason: wait_for_completion option was added in 6.6
-
   - do:
       headers:
         Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/sql/translate.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/sql/translate.yml
index 57f275af5e26b..dd4ce58dc80f7 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/test/sql/translate.yml
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/sql/translate.yml
@@ -1,9 +1,5 @@
 ---
 "Translate SQL":
-  - skip:
-      version: " - 6.99.99"
-      reason: Triggers warnings before 7.0
-
   - do:
       bulk:
         refresh: true
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/80_put_get_watch_with_passwords.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/80_put_get_watch_with_passwords.yml
index 077ddd2d30825..02191f0b680a9 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/80_put_get_watch_with_passwords.yml
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/80_put_get_watch_with_passwords.yml
@@ -117,10 +117,6 @@ setup:
 
 ---
 "Test putting a watch with a redacted password with old seq no returns an error":
-  - skip:
-      version: " - 6.6.99"
-      reason:  seq no powered concurrency was added in 6.7.0
-
   # version 1
   - do:
       watcher.put_watch:
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/stats/10_basic.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/stats/10_basic.yml
index f5a8b149fe952..b737b040f212d 100644
--- a/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/stats/10_basic.yml
+++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/stats/10_basic.yml
@@ -15,10 +15,6 @@
 
 ---
 "Test watcher stats current watches":
-  - skip:
-      version: " - 6.99.99"
-      reason:  metrics were fixed in 7.0.0
-
   - do:
       watcher.stats:
         metric: "current_watches"
@@ -28,10 +24,6 @@
 
 ---
 "Test watcher stats queued watches":
-  - skip:
-      version: " - 6.99.99"
-      reason:  metrics were fixed in 7.0.0
-
   - do:
       watcher.stats:
         metric: "queued_watches"
@@ -42,7 +34,6 @@
 ---
 "Test watcher stats queued watches using pending_watches":
   - skip:
-      version: " - 6.99.99"
       reason:  metrics were fixed in 7.0.0
       features: warnings
 
diff --git a/x-pack/qa/core-rest-tests-with-security/src/test/resources/rest-api-spec/test/rankeval/10_rankeval.yml b/x-pack/qa/core-rest-tests-with-security/src/test/resources/rest-api-spec/test/rankeval/10_rankeval.yml
index 4720377909375..ed00c34874d21 100644
--- a/x-pack/qa/core-rest-tests-with-security/src/test/resources/rest-api-spec/test/rankeval/10_rankeval.yml
+++ b/x-pack/qa/core-rest-tests-with-security/src/test/resources/rest-api-spec/test/rankeval/10_rankeval.yml
@@ -2,11 +2,6 @@
 # pull in rest test from modules in core
 ---
 "Basic Rankeval test":
-
-  - skip:
-      version: " - 6.2.99"
-      reason: response format was updated in 6.3
-
   - do:
      indices.create:
          index: foo
diff --git a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml
index 3401d6e212717..bca44b5f16a38 100644
--- a/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml
+++ b/x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml
@@ -133,50 +133,8 @@
             }
           }
 
----
-"Test job with pre 6.4 rules":
-
-  - skip:
-      version:  "6.4.0 - "
-      reason:   "Rules were replaced by custom_rules on 6.4.0"
-
-  - do:
-      ml.put_job:
-        job_id: job-with-old-rules
-        body:  >
-          {
-            "analysis_config": {
-              "detectors": [
-                {
-                  "function": "count",
-                  "by_field_name": "country",
-                  "detector_rules": [
-                    {
-                      "rule_action": "filter_results",
-                      "rule_conditions": [
-                        {
-                          "condition_type":"numerical_actual",
-                          "field_name":"country",
-                          "field_value": "uk",
-                          "condition": {"operator":"lt","value":"33.3"}
-                        },
-                        {"condition_type":"categorical", "field_name":"country", "value_filter": "foo"}
-                      ]
-                    }
-                  ]
-                }
-              ]
-            },
-            "data_description" : {}
-          }
-
 ---
 "Test job with pre 6.4 rules - dummy job 6.4 onwards":
-
-  - skip:
-      version:  " - 6.3.99"
-      reason:   "Rules replaced by custom_rules on 6.4.0"
-
   - do:
       ml.put_job:
         job_id: job-with-old-rules
diff --git a/x-pack/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/mustache/30_search_input.yml b/x-pack/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/mustache/30_search_input.yml
index d712ddba3a498..7866b54de7c77 100644
--- a/x-pack/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/mustache/30_search_input.yml
+++ b/x-pack/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/mustache/30_search_input.yml
@@ -168,9 +168,6 @@ setup:
 
 ---
 "Test search input mustache integration (using request body and rest_total_hits_as_int)":
-  - skip:
-      version: " - 6.99.99"
-      reason: "rest_total_hits_as_int support was added in 7.0"
   - do:
       watcher.execute_watch:
         body: >
@@ -222,10 +219,6 @@ setup:
 
 ---
 "Test search input mustache integration (using request template and rest_total_hits_as_int)":
-  - skip:
-      version: " - 6.99.99"
-      reason: "rest_total_hits_as_int support was added in 7.0"
-
   - do:
       put_script:
         id: "search-template"
diff --git a/x-pack/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/painless/10_basic.yml b/x-pack/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/painless/10_basic.yml
index 7f6db2a6d6614..6ec0adcc93310 100644
--- a/x-pack/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/painless/10_basic.yml
+++ b/x-pack/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/painless/10_basic.yml
@@ -123,10 +123,6 @@
 
 ---
 "Test execute watch api with rest_total_hits_as_int":
-  - skip:
-      version: " - 6.99.99"
-      reason: "rest_total_hits_as_int support was added in 7.0"
-
   - do:
       cluster.health:
         wait_for_status: green