From 6acdddce64a0cbe8981bc628cb5084de9770e188 Mon Sep 17 00:00:00 2001
From: Zachary Tong <polyfractal@elastic.co>
Date: Tue, 2 Apr 2019 16:39:13 -0400
Subject: [PATCH] Remove yaml skips older than 7.0 (#40183)

These are now obsolete in 8.0, and make adding new skips complicated.
Also found some very old skips (5.4!)
---
 .../rest-api-spec/test/bulk/10_basic.yml      | 10 ++------
 .../test/bulk/20_list_of_strings.yml          |  4 +---
 .../rest-api-spec/test/bulk/30_big_string.yml |  4 +---
 .../rest-api-spec/test/bulk/40_source.yml     |  4 +---
 .../rest-api-spec/test/bulk/50_refresh.yml    | 12 +++-------
 .../test/bulk/70_mix_typeless_typeful.yml     |  4 ----
 .../test/bulk/81_cas_with_types.yml           |  4 ----
 .../test/cat.thread_pool/10_basic.yml         |  3 ---
 .../test/cluster.health/10_basic.yml          |  3 ---
 .../test/cluster.state/10_basic.yml           |  3 ---
 .../test/cluster.state/20_filtering.yml       |  3 ---
 .../test/cluster.stats/10_basic.yml           |  6 -----
 .../rest-api-spec/test/create/10_with_id.yml  |  4 +---
 .../test/create/15_without_id.yml             |  4 +---
 .../test/create/35_external_version.yml       |  4 +---
 .../rest-api-spec/test/create/40_routing.yml  |  4 +---
 .../rest-api-spec/test/create/60_refresh.yml  | 12 +++-------
 .../rest-api-spec/test/create/70_nested.yml   | 12 +++-------
 .../test/create/71_nested_with_types.yml      |  8 ++-----
 .../rest-api-spec/test/delete/10_basic.yml    |  4 +---
 .../test/delete/11_shard_header.yml           |  4 +---
 .../rest-api-spec/test/delete/12_result.yml   |  4 +---
 .../rest-api-spec/test/delete/20_cas.yml      |  4 +---
 .../test/delete/25_external_version.yml       |  4 +---
 .../test/delete/26_external_gte_version.yml   |  4 +---
 .../rest-api-spec/test/delete/30_routing.yml  |  4 +---
 .../rest-api-spec/test/delete/50_refresh.yml  | 12 +++-------
 .../rest-api-spec/test/delete/60_missing.yml  |  8 ++-----
 .../test/delete/70_mix_typeless_typeful.yml   |  4 ----
 .../rest-api-spec/test/exists/10_basic.yml    |  4 +---
 .../rest-api-spec/test/exists/40_routing.yml  |  4 +---
 .../test/exists/60_realtime_refresh.yml       |  4 +---
 .../rest-api-spec/test/exists/70_defaults.yml |  4 +---
 .../rest-api-spec/test/explain/10_basic.yml   |  4 +---
 .../test/explain/20_source_filtering.yml      |  4 +---
 .../test/explain/30_query_string.yml          |  4 +---
 .../test/explain/40_mix_typeless_typeful.yml  |  4 ----
 .../test/field_caps/10_basic.yml              |  7 +-----
 .../test/get/100_mix_typeless_typeful.yml     |  3 ---
 .../rest-api-spec/test/get/10_basic.yml       |  4 ----
 .../test/get/15_default_values.yml            |  4 +---
 .../test/get/20_stored_fields.yml             |  3 ---
 .../rest-api-spec/test/get/40_routing.yml     |  4 +---
 .../test/get/50_with_headers.yml              |  2 --
 .../test/get/60_realtime_refresh.yml          |  4 +---
 .../test/get/70_source_filtering.yml          |  4 +---
 .../rest-api-spec/test/get/80_missing.yml     |  6 -----
 .../rest-api-spec/test/get/90_versions.yml    |  4 +---
 .../test/get_source/10_basic.yml              |  4 +---
 .../test/get_source/15_default_values.yml     |  4 +---
 .../test/get_source/40_routing.yml            |  4 +---
 .../test/get_source/60_realtime_refresh.yml   |  4 +---
 .../test/get_source/70_source_filtering.yml   |  4 +---
 .../test/get_source/80_missing.yml            |  4 ----
 .../test/get_source/85_source_missing.yml     |  4 +---
 .../rest-api-spec/test/index/10_with_id.yml   |  4 +---
 .../rest-api-spec/test/index/12_result.yml    |  4 +---
 .../test/index/15_without_id.yml              |  4 +---
 .../rest-api-spec/test/index/20_optype.yml    |  4 +---
 .../test/index/35_external_version.yml        |  4 +---
 .../test/index/36_external_gte_version.yml    |  4 +---
 .../rest-api-spec/test/index/40_routing.yml   |  4 +---
 .../rest-api-spec/test/index/60_refresh.yml   | 12 +++-------
 .../test/indices.analyze/20_analyze_limit.yml | 12 +++-------
 .../test/indices.create/10_basic.yml          | 24 +++----------------
 .../indices.create/11_basic_with_types.yml    |  4 +---
 .../test/indices.flush/10_basic.yml           |  4 +---
 .../test/indices.get/11_basic_with_types.yml  |  7 +-----
 .../indices.get_field_mapping/10_basic.yml    |  4 +---
 .../20_missing_field.yml                      |  4 +---
 .../50_field_wildcards.yml                    |  4 +---
 .../70_mix_typeless_typeful.yml               |  4 ----
 .../test/indices.open/10_basic.yml            |  3 ---
 .../test/indices.put_alias/10_basic.yml       |  4 ----
 .../test/indices.put_template/10_basic.yml    | 12 ----------
 .../indices.rollover/20_max_doc_condition.yml |  3 ---
 .../41_mapping_with_types.yml                 |  3 ---
 .../test/indices.shrink/10_basic.yml          |  4 +---
 .../test/indices.shrink/20_source_mapping.yml |  4 +---
 .../test/indices.shrink/30_copy_settings.yml  |  4 +---
 .../test/indices.stats/10_index.yml           |  4 +---
 .../test/indices.stats/20_translog.yml        |  4 +---
 .../rest-api-spec/test/mget/10_basic.yml      |  4 +---
 .../test/mget/12_non_existent_index.yml       |  4 +---
 .../test/mget/13_missing_metadata.yml         |  4 +---
 .../mget/14_alias_to_multiple_indices.yml     |  4 +---
 .../rest-api-spec/test/mget/15_ids.yml        |  4 +---
 .../test/mget/17_default_index.yml            |  4 +---
 .../test/mget/20_stored_fields.yml            |  4 +---
 .../rest-api-spec/test/mget/40_routing.yml    |  4 +---
 .../test/mget/60_realtime_refresh.yml         |  4 +---
 .../test/mget/70_source_filtering.yml         |  4 +---
 .../rest-api-spec/test/mget/80_deprecated.yml |  2 --
 .../test/mget/80_deprecated_with_types.yml    |  2 --
 .../rest-api-spec/test/msearch/10_basic.yml   |  3 ---
 .../test/mtermvectors/10_basic.yml            |  4 +---
 .../test/mtermvectors/20_deprecated.yml       |  7 ------
 .../mtermvectors/21_deprecated_with_types.yml |  2 --
 .../mtermvectors/30_mix_typeless_typeful.yml  |  4 ----
 .../rest-api-spec/test/scroll/10_basic.yml    | 15 +++---------
 .../rest-api-spec/test/scroll/12_slices.yml   |  3 ---
 .../test/search.aggregation/20_terms.yml      |  4 ----
 .../search.aggregation/290_geotile_grid.yml   |  4 +---
 .../test/search.aggregation/40_range.yml      |  3 ---
 .../test/search.aggregation/50_filter.yml     |  4 +---
 .../test/search.aggregation/80_typed_keys.yml |  2 --
 .../test/search.inner_hits/10_basic.yml       |  8 +------
 .../test/search/10_source_filtering.yml       | 18 ++++----------
 .../test/search/110_field_collapsing.yml      | 16 +------------
 .../search/115_multiple_field_collapsing.yml  |  4 +---
 .../test/search/160_exists_query.yml          | 12 +++-------
 .../search/171_terms_query_with_types.yml     |  4 +---
 .../test/search/20_default_values.yml         |  4 +---
 .../test/search/230_interval_query.yml        |  3 ---
 .../test/search/240_date_nanos.yml            |  4 +---
 .../rest-api-spec/test/search/30_limits.yml   |  6 -----
 .../test/search/40_indices_boost.yml          |  1 -
 .../test/snapshot.create/10_basic.yml         |  3 ---
 .../test/snapshot.get/10_basic.yml            |  3 ---
 .../test/suggest/20_completion.yml            |  3 ---
 .../rest-api-spec/test/suggest/30_context.yml |  6 -----
 .../test/tasks.list/10_basic.yml              |  2 --
 .../test/termvectors/10_basic.yml             |  4 ----
 .../test/termvectors/20_issue7121.yml         |  6 -----
 .../test/termvectors/30_realtime.yml          |  6 -----
 .../termvectors/50_mix_typeless_typeful.yml   |  4 ----
 .../rest-api-spec/test/update/10_doc.yml      |  4 +---
 .../test/update/11_shard_header.yml           |  4 +---
 .../rest-api-spec/test/update/12_result.yml   |  4 +---
 .../test/update/20_doc_upsert.yml             |  4 +---
 .../test/update/22_doc_as_upsert.yml          |  4 +---
 .../rest-api-spec/test/update/40_routing.yml  |  4 +---
 .../rest-api-spec/test/update/60_refresh.yml  | 12 +++-------
 .../test/update/80_source_filtering.yml       |  4 +---
 .../test/update/90_mix_typeless_typeful.yml   |  8 -------
 135 files changed, 117 insertions(+), 564 deletions(-)

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml
index e8593c4c8d5ff..591cb057ede4c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml
@@ -1,9 +1,7 @@
 ---
 "Array of objects":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       bulk:
@@ -29,9 +27,7 @@
 ---
 "Empty _id":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       bulk:
@@ -65,9 +61,7 @@
 "empty action":
 
   - skip:
-      version: " - 6.99.99"
       features: headers
-      reason: types are required in requests before 7.0.0
 
   - do:
       catch: /Malformed action\/metadata line \[3\], expected FIELD_NAME but found \[END_OBJECT\]/
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/20_list_of_strings.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/20_list_of_strings.yml
index b23517f6a8f25..f99053cba42ec 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/20_list_of_strings.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/20_list_of_strings.yml
@@ -1,9 +1,7 @@
 ---
 "List of strings":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       bulk:
         refresh: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yml
index 38706d133e44b..62cc5838a528d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yml
@@ -1,9 +1,7 @@
 ---
 "One big string":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       bulk:
         refresh: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml
index 5e783d60d3d46..fcdbfec55a472 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml
@@ -1,9 +1,7 @@
 ---
 "Source filtering":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       index:
         refresh: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yml
index 77098779c0c4f..29ee7bbd11f3a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yml
@@ -1,9 +1,7 @@
 ---
 "refresh=true immediately makes changes are visible in search":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       bulk:
         refresh: true
@@ -21,9 +19,7 @@
 ---
 "refresh=empty string immediately makes changes are visible in search":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       bulk:
         refresh: ""
@@ -42,9 +38,7 @@
 ---
 "refresh=wait_for waits until changes are visible in search":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       bulk:
         refresh: wait_for
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/70_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/70_mix_typeless_typeful.yml
index cad0891b21e52..50bf6ac5bcf3a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/70_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/70_mix_typeless_typeful.yml
@@ -1,10 +1,6 @@
 ---
 "bulk without types 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
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/81_cas_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/81_cas_with_types.yml
index 101316e7bf504..7de82e4fb23e0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/81_cas_with_types.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/81_cas_with_types.yml
@@ -1,10 +1,6 @@
 ---
 "Compare And Swap Sequence Numbers":
 
- - skip:
-      version: " - 6.6.99"
-      reason:  cas operations with sequence numbers was added in 6.7
-
  - do:
       index:
           index:  test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/10_basic.yml
index 1ce8468cb51f9..e91db3f434a92 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/10_basic.yml
@@ -1,8 +1,5 @@
 ---
 "Test cat thread_pool output":
-  - skip:
-        version: " - 6.99.99"
-        reason: this API was changed in a backwards-incompatible fashion in 7.0.0 so we need to skip in a mixed cluster
 
   - do:
       cat.thread_pool: {}
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml
index 01c82623ef031..b06005b7ea765 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml
@@ -94,9 +94,6 @@
 
 ---
 "cluster health basic test, one index with wait for no initializing shards":
-  - skip:
-      version: " - 6.1.99"
-      reason: "wait_for_no_initializing_shards is introduced in 6.2.0"
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml
index b443e322f80f6..ef17e4a3f2473 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml
@@ -7,9 +7,6 @@
 
 ---
 "get cluster state returns cluster_uuid at the top level":
-  - skip:
-      version:  " - 6.3.99"
-      reason:   "cluster state including cluster_uuid at the top level is new in v6.4.0 and higher"
 
   - do:
       cluster.state:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yml
index 88da42ee876be..0ab2b64f09a9d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yml
@@ -155,9 +155,6 @@ setup:
 
 ---
 "Filtering the cluster state returns cluster_uuid at the top level regardless of metric filters":
-  - skip:
-      version:  " - 6.3.99"
-      reason:   "cluster state including cluster_uuid at the top level is new in v6.4.0 and higher"
 
   # Get the current cluster_uuid
   - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml
index bb57709e14792..d2834499ef6aa 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml
@@ -32,9 +32,6 @@
 
 ---
 "get cluster stats returns cluster_uuid at the top level":
-  - skip:
-      version: " - 6.99.99"
-      reason:  "cluster stats including cluster_uuid at the top level is new in v6.5.0 and higher"
 
   - do:
       cluster.stats: {}
@@ -69,9 +66,6 @@
 
 ---
 "get cluster stats returns discovery types":
-  - skip:
-      version: " - 6.99.99"
-      reason:  "discovery types are added for v7.0.0"
 
   - do:
       cluster.stats: {}
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/10_with_id.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/10_with_id.yml
index 410b31acb7138..f69e3600a43d3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/create/10_with_id.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/create/10_with_id.yml
@@ -1,8 +1,6 @@
 ---
 "Create with ID":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
  - do:
       create:
           index:  test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/15_without_id.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/15_without_id.yml
index 5280c5bb9946d..ddfb4775458c9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/create/15_without_id.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/create/15_without_id.yml
@@ -1,8 +1,6 @@
 ---
 "Create without ID":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
  - do:
       catch: param
       create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml
index 47dc5b6059609..86d0d4b59e06b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml
@@ -1,8 +1,6 @@
 ---
 "External version":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
  - do:
       catch:              bad_request
       create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/40_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/40_routing.yml
index 9c048c361bd5c..af8d865031bc4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/create/40_routing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/create/40_routing.yml
@@ -1,8 +1,6 @@
 ---
 "Routing":
- - skip:
-     version: " - 6.99.99"
-     reason: types are required in requests before 7.0.0
+
  - do:
      indices.create:
        index:    test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/60_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/60_refresh.yml
index dd8acd9f99f4f..e348a980de685 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/create/60_refresh.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/create/60_refresh.yml
@@ -1,8 +1,6 @@
 ---
 "Refresh":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
  - do:
       indices.create:
           index:    test_1
@@ -44,9 +42,7 @@
 
 ---
 "When refresh url parameter is an empty string that means \"refresh immediately\"":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
  - do:
       create:
           index:   test_1
@@ -66,9 +62,7 @@
 
 ---
 "refresh=wait_for waits until changes are visible in search":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
  - do:
       index:
           index:   create_60_refresh_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/70_nested.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/70_nested.yml
index e6d2413f16788..cc9a82cbcbc9e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/create/70_nested.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/create/70_nested.yml
@@ -1,8 +1,6 @@
 ---
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       indices.create:
           index: test_1
@@ -16,9 +14,7 @@ setup:
 
 ---
 "Indexing a doc with No. nested objects less or equal to index.mapping.nested_objects.limit should succeed":
-  - skip:
-      version: " - 6.99.99"
-      reason:  index.mapping.nested_objects setting has been added in 7.0.0
+
   - do:
       create:
           index:  test_1
@@ -29,9 +25,7 @@ setup:
 
 ---
 "Indexing a doc with No. nested objects more than index.mapping.nested_objects.limit should fail":
-  - skip:
-      version: " - 6.99.99"
-      reason:  index.mapping.nested_objects setting has been added in 7.0.0
+
   - do:
       catch: /The number of nested documents has exceeded the allowed limit of \[2\]. This limit can be set by changing the \[index.mapping.nested_objects.limit\] index level setting\./
       create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/71_nested_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/71_nested_with_types.yml
index 755aaca448b0b..1b8c549942730 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/create/71_nested_with_types.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/create/71_nested_with_types.yml
@@ -15,9 +15,7 @@ setup:
 
 ---
 "Indexing a doc with No. nested objects less or equal to index.mapping.nested_objects.limit should succeed":
-  - skip:
-      version: " - 6.99.99"
-      reason:  index.mapping.nested_objects setting has been added in 7.0.0
+
   - do:
       create:
           index:  test_1
@@ -29,9 +27,7 @@ setup:
 
 ---
 "Indexing a doc with No. nested objects more than index.mapping.nested_objects.limit should fail":
-  - skip:
-      version: " - 6.99.99"
-      reason:  index.mapping.nested_objects setting has been added in 7.0.0
+
   - do:
       catch: /The number of nested documents has exceeded the allowed limit of \[2\]. This limit can be set by changing the \[index.mapping.nested_objects.limit\] index level setting\./
       create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/10_basic.yml
index 842d749d7b14d..f58f1435046fc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/10_basic.yml
@@ -1,9 +1,7 @@
 ---
 "Basic":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yml
index 3fc10bc8db12d..673897af1d62e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yml
@@ -1,9 +1,7 @@
 ---
 "Delete check shard header":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/12_result.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/12_result.yml
index 13356cd938c48..dba565179cded 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/12_result.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/12_result.yml
@@ -1,9 +1,7 @@
 ---
 "Delete result field":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/20_cas.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/20_cas.yml
index f3c7b0acbcccd..a739e3f53cd44 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/20_cas.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/20_cas.yml
@@ -1,9 +1,7 @@
 ---
 "Internal version":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/25_external_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/25_external_version.yml
index d7cc4fce0eda5..e076dbded6f0c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/25_external_version.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/25_external_version.yml
@@ -1,9 +1,7 @@
 ---
 "External version":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/26_external_gte_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/26_external_gte_version.yml
index ebe1680551c96..03adef4a75fa9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/26_external_gte_version.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/26_external_gte_version.yml
@@ -1,9 +1,7 @@
 ---
 "External GTE version":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yml
index 27e9350caed70..c2d6adfcd4e72 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yml
@@ -1,9 +1,7 @@
 ---
 "Routing":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yml
index 935e0946f100b..bac8731d47250 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yml
@@ -1,9 +1,7 @@
 ---
 "Refresh":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
@@ -81,9 +79,7 @@
 ---
 "When refresh url parameter is an empty string that means \"refresh immediately\"":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
@@ -118,9 +114,7 @@
 ---
 "refresh=wait_for waits until changes are visible in search":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/60_missing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/60_missing.yml
index b8f81080f3ee8..ae4e61c075ae8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/60_missing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/60_missing.yml
@@ -1,9 +1,7 @@
 ---
 "Missing document with catch":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       catch:      missing
@@ -14,9 +12,7 @@
 ---
 "Missing document with ignore":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       delete:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/70_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/70_mix_typeless_typeful.yml
index e0f20795e41ca..9f6f170dcd192 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/70_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/70_mix_typeless_typeful.yml
@@ -1,10 +1,6 @@
 ---
 "DELETE 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
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/10_basic.yml
index 1ab90e3efa83f..141e2898bb21b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/10_basic.yml
@@ -1,8 +1,6 @@
 ---
 "Basic":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       exists:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/40_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/40_routing.yml
index 8d59c8a0535f5..086286276fcd3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/40_routing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/40_routing.yml
@@ -1,8 +1,6 @@
 ---
 "Routing":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
      indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/60_realtime_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/60_realtime_refresh.yml
index e12a504349c4d..6aebaa78b8a0a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/60_realtime_refresh.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/60_realtime_refresh.yml
@@ -1,8 +1,6 @@
 ---
 "Realtime Refresh":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
      indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/70_defaults.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/70_defaults.yml
index 6fabdd59820cf..a042888d66d1c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/70_defaults.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/70_defaults.yml
@@ -1,8 +1,6 @@
 ---
 "Client-side default type":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml
index bfe8da8d91519..50a5804d887c7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml
@@ -1,7 +1,5 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/20_source_filtering.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/20_source_filtering.yml
index ad596f980807b..ae03a58f13f6d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/20_source_filtering.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/20_source_filtering.yml
@@ -1,8 +1,6 @@
 ---
 "Source filtering":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/30_query_string.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/30_query_string.yml
index ac34d4c2495f2..61321c05548ce 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/30_query_string.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/30_query_string.yml
@@ -1,8 +1,6 @@
 ---
 "explain with query_string parameters":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/40_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/40_mix_typeless_typeful.yml
index 36fdbaa6b6f78..af2feb4231f30 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/40_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/40_mix_typeless_typeful.yml
@@ -1,10 +1,6 @@
 ---
 "Explain 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
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml
index fee9933bb8510..f65d295fa89d8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml
@@ -149,9 +149,6 @@ setup:
   - is_false: fields.geo.keyword.on_aggregatable_indices
 ---
 "Get date_nanos field caps":
-  - skip:
-      version: " - 6.99.99"
-      reason: date_nanos field mapping type has been introcued in 7.0
 
   - do:
         indices.create:
@@ -204,9 +201,7 @@ setup:
   - is_false: fields.object\.nested2.keyword.non_searchable_indices
 ---
 "Get object and nested field caps":
-  - skip:
-      version: " - 6.99.99"
-      reason: object and nested fields are returned since 7.0
+
 
   - do:
       field_caps:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/100_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/100_mix_typeless_typeful.yml
index d13229dbffbc6..11d1e6ea45c7f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/100_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/100_mix_typeless_typeful.yml
@@ -1,9 +1,6 @@
 ---
 "GET 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
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/10_basic.yml
index 9183c70c29bce..11be0f2cd5f4e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/10_basic.yml
@@ -1,10 +1,6 @@
 ---
 "Basic":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
   - do:
       index:
         index: test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/15_default_values.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/15_default_values.yml
index 67065270665cf..2b32a6ab819aa 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/15_default_values.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/15_default_values.yml
@@ -1,9 +1,7 @@
 ---
 "Default values":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       index:
         index: test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/20_stored_fields.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/20_stored_fields.yml
index ab27842e4516e..207665b9c8849 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/20_stored_fields.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/20_stored_fields.yml
@@ -1,9 +1,6 @@
 ---
 "Stored fields":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       indices.create:
         index: test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/40_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/40_routing.yml
index 9ba546d6ef942..9ce60a7e8c12a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/40_routing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/40_routing.yml
@@ -1,9 +1,7 @@
 ---
 "Routing":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
      indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yml
index 38130cee59810..e5447fffdaf0f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yml
@@ -2,8 +2,6 @@
 "REST test with headers":
   - skip:
       features: ["headers", "yaml"]
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       index:
         index: test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/60_realtime_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/60_realtime_refresh.yml
index ef4fa60bf1b0e..7f35bcae063df 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/60_realtime_refresh.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/60_realtime_refresh.yml
@@ -1,9 +1,7 @@
 ---
 "Realtime Refresh":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/70_source_filtering.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/70_source_filtering.yml
index f4a5ba39be3b8..952375cedd6d6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/70_source_filtering.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/70_source_filtering.yml
@@ -1,9 +1,7 @@
 ---
 "Source filtering":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       indices.create:
         index: test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/80_missing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/80_missing.yml
index d7d8edfc65dcb..1e60246f97941 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/80_missing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/80_missing.yml
@@ -1,9 +1,6 @@
 ---
 "Missing document with catch":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       catch:   missing
       get:
@@ -13,9 +10,6 @@
 ---
 "Missing document with ignore":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       get:
         index:  test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/90_versions.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/90_versions.yml
index 9037a9113e937..cafe6f86193f3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/90_versions.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/90_versions.yml
@@ -1,9 +1,7 @@
 ---
 "Versions":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/10_basic.yml
index 6f81c430c883a..7318602bb66d7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/10_basic.yml
@@ -1,9 +1,7 @@
 ---
 "Basic":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/15_default_values.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/15_default_values.yml
index 57c11a1ca10e2..0e53f92ce4eaa 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/15_default_values.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/15_default_values.yml
@@ -2,9 +2,7 @@
 "Default values":
 
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/40_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/40_routing.yml
index 6425f70f26aad..1396f2ab8ad22 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/40_routing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/40_routing.yml
@@ -2,9 +2,7 @@
 "Routing":
 
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
      indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml
index d39b07a6ce5f7..7891e7f84d92f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml
@@ -1,9 +1,7 @@
 ---
 "Realtime":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/70_source_filtering.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/70_source_filtering.yml
index 2665458cea95d..6570524630e5a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/70_source_filtering.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/70_source_filtering.yml
@@ -2,9 +2,7 @@
 "Source filtering":
 
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yml
index b704fc2612007..d7d2975790606 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yml
@@ -3,8 +3,6 @@
 
   - skip:
       features: warnings
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
 
   - do:
       catch:   missing
@@ -17,8 +15,6 @@
 
   - skip:
       features: warnings
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
 
   - do:
       get_source:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/85_source_missing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/85_source_missing.yml
index c214bf87d3997..2ec0585b0f7bc 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/85_source_missing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/85_source_missing.yml
@@ -1,9 +1,7 @@
 ---
 setup:
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml
index a129dcab80d9a..ffc55a8d2908a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml
@@ -1,9 +1,7 @@
 ---
 "Index with ID":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/12_result.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/12_result.yml
index f8a50415a95ef..626ff1f443d64 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/12_result.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/12_result.yml
@@ -1,9 +1,7 @@
 ---
 "Index result field":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       index:
           index:  test_index
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/15_without_id.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/15_without_id.yml
index 073a4704b4ef8..eea7882319fba 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/15_without_id.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/15_without_id.yml
@@ -1,9 +1,7 @@
 ---
 "Index without ID":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/20_optype.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/20_optype.yml
index c33a86093acab..aea2af3860365 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/20_optype.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/20_optype.yml
@@ -1,9 +1,7 @@
 ---
 "Optype":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/35_external_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/35_external_version.yml
index 89aaa190af384..857c9d3c39c92 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/35_external_version.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/35_external_version.yml
@@ -1,9 +1,7 @@
 ---
 "External version":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/36_external_gte_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/36_external_gte_version.yml
index 82421227adb7f..30a8cf453a7d1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/36_external_gte_version.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/36_external_gte_version.yml
@@ -1,9 +1,7 @@
 ---
 "External GTE version":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/40_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/40_routing.yml
index 630cf39dbe65c..f3cefc56a8e98 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/40_routing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/40_routing.yml
@@ -1,9 +1,7 @@
 ---
 "Routing":
 
- - skip:
-     version: " - 6.99.99"
-     reason: types are required in requests before 7.0.0
+
  - do:
      indices.create:
        index:    test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/60_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/60_refresh.yml
index e16602d7ac8b6..8a76930ac266c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/index/60_refresh.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/index/60_refresh.yml
@@ -1,9 +1,7 @@
 ---
 "Refresh":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
@@ -48,9 +46,7 @@
 ---
 "When refresh url parameter is an empty string that means \"refresh immediately\"":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
@@ -72,9 +68,7 @@
 ---
 "refresh=wait_for waits until changes are visible in search":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/20_analyze_limit.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/20_analyze_limit.yml
index 87d3b77aee329..324147bd4bcae 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/20_analyze_limit.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/20_analyze_limit.yml
@@ -9,9 +9,7 @@ setup:
 
 ---
 "_analyze with No. generated tokens less than or equal to index.analyze.max_token_count should succeed":
-  - skip:
-      version: " - 6.99.99"
-      reason:  index.analyze.max_token_count setting has been added in 7.0.0
+
   - do:
       indices.analyze:
           index:  test_1
@@ -25,9 +23,7 @@ setup:
 
 ---
 "_analyze with No. generated tokens more than index.analyze.max_token_count should fail":
-  - skip:
-      version: " - 6.99.99"
-      reason:  index.analyze.max_token_count setting has been added in 7.0.0
+
   - do:
       catch: /The number of tokens produced by calling _analyze has exceeded the allowed maximum of \[3\]. This limit can be set by changing the \[index.analyze.max_token_count\] index level setting\./
       indices.analyze:
@@ -39,9 +35,7 @@ setup:
 
 ---
 "_analyze with explain with No. generated tokens more than index.analyze.max_token_count should fail":
-  - skip:
-      version: " - 6.99.99"
-      reason:  index.analyze.max_token_count setting has been added in 7.0.0
+
   - do:
       catch: /The number of tokens produced by calling _analyze has exceeded the allowed maximum of \[3\]. This limit can be set by changing the \[index.analyze.max_token_count\] index level setting\./
       indices.analyze:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yml
index 965083421cbaf..ba227556a8f11 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yml
@@ -1,9 +1,6 @@
 ---
 "Create index with mappings":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
   - do:
       indices.create:
         index: test_index
@@ -20,9 +17,7 @@
 ---
 "Create index with settings":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
+
   - do:
       indices.create:
         index: test_index
@@ -39,9 +34,6 @@
 ---
 "Create index":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
   - do:
       indices.create:
         index: test_index
@@ -52,9 +44,6 @@
 ---
 "Create index with wait_for_active_shards set to all":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
   - do:
       indices.create:
         index: test_index
@@ -69,9 +58,6 @@
 ---
 "Create index with aliases":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
   - do:
       indices.create:
         index: test_index
@@ -102,9 +88,7 @@
 
 ---
 "Create index with write aliases":
-  - skip:
-      version: " - 6.99.99"
-      reason: is_write_index is not implemented in ES <= 6.x
+
   - do:
       indices.create:
         index: test_index
@@ -138,9 +122,7 @@
 
 ---
 "Create index with explicit _doc type":
-  - skip:
-      version: " - 6.99.99"
-      reason: include_type_name defaults to true before 7.0
+
   - do:
       catch: bad_request
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/11_basic_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/11_basic_with_types.yml
index f5aeb53751119..e74ffd9cf1770 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/11_basic_with_types.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/11_basic_with_types.yml
@@ -94,9 +94,7 @@
 
 ---
 "Create index with write aliases":
-  - skip:
-      version: " - 6.99.99"
-      reason: is_write_index is not implemented in ES <= 6.x
+
   - do:
       indices.create:
         include_type_name: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml
index 6ba46c795da79..a4a61b0e598d1 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml
@@ -24,9 +24,7 @@
 
 ---
 "Flush stats":
-  - skip:
-      version: " - 6.2.99"
-      reason: periodic flush stats is introduced in 6.3.0
+
   - do:
       indices.create:
         index: test
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/11_basic_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/11_basic_with_types.yml
index 413c4bcb8d28c..3ca4417870376 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/11_basic_with_types.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/11_basic_with_types.yml
@@ -44,9 +44,7 @@ setup:
 
 ---
 "Test include_type_name":
-  - skip:
-      version: " - 6.6.99"
-      reason: the include_type_name parameter is not supported before 6.7
+
 
   - do:
       indices.get:
@@ -66,9 +64,6 @@ setup:
 
 ---
 "Test include_type_name dafaults to false":
-  - skip:
-      version: " - 6.99.99"
-      reason: the include_type_name parameter default is different on 6.x and 7.0, so only test this on 7.0 clusters
 
   - do:
       indices.get:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml
index 9be1f7246d5f3..f19f315edb514 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml
@@ -1,8 +1,6 @@
 ---
 setup:
-  - 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.get_field_mapping/20_missing_field.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yml
index 1570ded351874..77b795686db4e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yml
@@ -1,8 +1,6 @@
 ---
 "Return empty object if field doesn't exist, but type and index do":
-  - 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.get_field_mapping/50_field_wildcards.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yml
index 7db61d122e7ce..fe17f6515a007 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yml
@@ -1,8 +1,6 @@
 ---
 setup:
-  - 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.get_mapping/70_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_mix_typeless_typeful.yml
index 162a8d340d48a..6a520c82aad24 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/70_mix_typeless_typeful.yml
@@ -1,10 +1,6 @@
 ---
 "GET mapping with typeless API on an index that has types":
 
- - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name was 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.open/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml
index 0e08690868d9e..6aaad4301d61b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml
@@ -38,9 +38,6 @@
 
 ---
 "Open index with wait_for_active_shards set to all":
-  - skip:
-      version: " - 6.0.99"
-      reason: wait_for_active_shards parameter was added in 6.1.0
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml
index dd0628ea993ee..60ef4cea1fca0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml
@@ -60,10 +60,6 @@
 ---
 "Can set is_write_index":
 
-  - skip:
-      version: " - 6.3.99"
-      reason: "is_write_index is only available from 6.4.0 on"
-
   - do:
       indices.create:
         index: test_index
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml
index 3850ba4150b4f..4807efd8ae9c9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml
@@ -1,8 +1,5 @@
 ---
 "Put template":
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
 
   - do:
       indices.put_template:
@@ -28,9 +25,6 @@
 
 ---
 "Put multiple template":
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
 
   - do:
       indices.put_template:
@@ -56,9 +50,6 @@
 
 ---
 "Put template with empty mappings":
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
 
   - do:
       indices.put_template:
@@ -241,9 +232,6 @@
 
 ---
 "Put template with explicit _doc type":
-  - skip:
-      version: " - 6.99.99"
-      reason: include_type_name defaults to true before 7.0
 
   - do:
       catch: bad_request
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/20_max_doc_condition.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/20_max_doc_condition.yml
index ec9fabe02595d..50409fb983c4f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/20_max_doc_condition.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/20_max_doc_condition.yml
@@ -1,8 +1,5 @@
 ---
 "Max docs rollover conditions matches only primary shards":
-  - skip:
-        version: "- 5.4.1"
-        reason:  "matching docs changed from all shards to primary shards"
 
   # create index with alias and replica
   - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/41_mapping_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/41_mapping_with_types.yml
index 36389f3ce8bba..8522b87b0b3f9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/41_mapping_with_types.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/41_mapping_with_types.yml
@@ -1,8 +1,5 @@
 ---
 "Typeless mapping":
-  - skip:
-      version: " - 6.99.99"
-      reason:  include_type_name defaults to true before 7.0.0
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml
index 41c851b71cc6c..54d3d38903bf3 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml
@@ -1,9 +1,7 @@
 ---
 "Shrink index via API":
   - skip:
-      version: " - 6.9.99"
-      reason: expects warnings that pre-7.0.0 will not send
-      features: [warnings, arbitrary_key]
+      features: "arbitrary_key"
 
   # creates an index with one document solely allocated on a particular data node
   # and shrinks it into a new index with a single shard
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/20_source_mapping.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/20_source_mapping.yml
index dec0760fc6b19..5b9c2540d499a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/20_source_mapping.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/20_source_mapping.yml
@@ -1,9 +1,7 @@
 ---
 "Shrink index ignores target template mapping":
     - skip:
-        version: " - 6.9.99"
-        reason: expects warnings that pre-7.0.0 will not send
-        features: [warnings, arbitrary_key]
+        features: "arbitrary_key"
 
     - do:
         nodes.info:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml
index eda095ff91f98..11f2053512833 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/30_copy_settings.yml
@@ -1,9 +1,7 @@
 ---
 "Copy settings during shrink index":
   - skip:
-      version: " - 6.9.99"
-      reason: expects warnings that pre-7.0.0 will not send
-      features: [warnings, arbitrary_key]
+      features: "arbitrary_key"
 
   - do:
       nodes.info:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml
index 1a650ee88eae6..a00282e586f49 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml
@@ -39,9 +39,7 @@ setup:
 
 ---
 "Index - all":
-  - skip:
-      version: " - 6.3.99"
-      reason: "uuid is only available from 6.4.0 on"
+
 
   - do:
       indices.stats: { index: _all }
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/20_translog.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/20_translog.yml
index 586a04f065cde..83b9c429bbdbf 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/20_translog.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/20_translog.yml
@@ -66,9 +66,7 @@ setup:
 
 ---
 "Translog last modified age stats":
-  - skip:
-      version: " - 6.2.99"
-      reason: translog last modified age stats was added in 6.3.0
+
   - do:
       index:
         index: test
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/10_basic.yml
index 798d699ae80a0..3b2b8103d882e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/10_basic.yml
@@ -1,8 +1,6 @@
 ---
 "Basic multi-get":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/12_non_existent_index.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/12_non_existent_index.yml
index a1101a903f896..5b2e941e6c3d6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/12_non_existent_index.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/12_non_existent_index.yml
@@ -1,8 +1,6 @@
 ---
 "Non-existent index":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/13_missing_metadata.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/13_missing_metadata.yml
index 2711bed58dbb1..42f7a5039d64e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/13_missing_metadata.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/13_missing_metadata.yml
@@ -1,8 +1,6 @@
 ---
 "Missing metadata":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml
index 4ee569956397c..dcf83b2c9b597 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml
@@ -1,8 +1,6 @@
 ---
 "Multi Get with alias that resolves to multiple indices":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       bulk:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml
index fbdc9b265a95a..3981d6d86e74d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml
@@ -1,8 +1,6 @@
 ---
 "IDs":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
         indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/17_default_index.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/17_default_index.yml
index d03f99be39517..7d732e5ad8748 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/17_default_index.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/17_default_index.yml
@@ -1,8 +1,6 @@
 ---
 "Default index/type":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/20_stored_fields.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/20_stored_fields.yml
index 45460deb04e0b..01548972f9604 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/20_stored_fields.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/20_stored_fields.yml
@@ -1,8 +1,6 @@
 ---
 "Stored fields":
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/40_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/40_routing.yml
index df2924f274bdf..923d620bc9400 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/40_routing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/40_routing.yml
@@ -1,8 +1,6 @@
 ---
 "Routing":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
      indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/60_realtime_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/60_realtime_refresh.yml
index 3b1bfcdca556c..8ae390943c6b5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/60_realtime_refresh.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/60_realtime_refresh.yml
@@ -1,8 +1,6 @@
 ---
 "Realtime Refresh":
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/70_source_filtering.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/70_source_filtering.yml
index 3a3086cf3616d..a70151fd2e756 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/70_source_filtering.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/70_source_filtering.yml
@@ -1,7 +1,5 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/80_deprecated.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/80_deprecated.yml
index 0283455350a80..b6b7a84100dd7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/80_deprecated.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/80_deprecated.yml
@@ -2,8 +2,6 @@
 ---
 "Deprecated parameters should fail in Multi Get query":
    - skip:
-       version: " - 6.99.99"
-       reason:  _version, _routing are removed starting from 7.0, their equivalents without underscore are used instead
        features: "warnings"
 
    - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/80_deprecated_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/80_deprecated_with_types.yml
index 5033f75c79426..c65a650dae563 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/80_deprecated_with_types.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/80_deprecated_with_types.yml
@@ -3,8 +3,6 @@
 "Deprecated parameters should fail in Multi Get query":
 
    - skip:
-       version: " - 6.99.99"
-       reason:  _version, _routing are removed starting from 7.0, their equivalents without underscore are used instead
        features: "warnings"
 
    - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml
index 5b092c9d15e44..9f6f2e70ae46d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml
@@ -94,9 +94,6 @@ setup:
 
 ---
 "Search with new response format":
-  - skip:
-      version: " - 6.99.99"
-      reason: hits.total is returned as an object in 7.0.0
 
   - do:
       msearch:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/10_basic.yml
index 87c3e6065bba4..4edee1390462b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/10_basic.yml
@@ -1,7 +1,5 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       indices.create:
           index: testidx
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/20_deprecated.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/20_deprecated.yml
index 376192680c99b..db8e566f4b613 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/20_deprecated.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/20_deprecated.yml
@@ -1,14 +1,7 @@
-setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
 ---
 "Deprecated camel case and _ parameters should fail in Term Vectors query":
 
    - skip:
-       version: " - 6.99.99"
-       reason:  camel case and _ parameters (e.g. versionType, _version_type) should fail from 7.0
        features: "warnings"
 
    - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/21_deprecated_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/21_deprecated_with_types.yml
index b0335498e22a1..3e39a33e1061d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/21_deprecated_with_types.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/21_deprecated_with_types.yml
@@ -3,8 +3,6 @@
 "Deprecated camel case and _ parameters should fail in Term Vectors query":
 
    - skip:
-       version: " - 6.99.99"
-       reason:  camel case and _ parameters (e.g. versionType, _version_type) should fail from 7.0
        features: "warnings"
 
    - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/30_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/30_mix_typeless_typeful.yml
index b14b5f94ebbc2..51d8e23dbfa62 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/30_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/30_mix_typeless_typeful.yml
@@ -1,10 +1,6 @@
 ---
 "mtermvectors without types 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
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/10_basic.yml
index aa6d1e9841dd7..957d1dc20fbb7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/10_basic.yml
@@ -198,9 +198,7 @@
 
 ---
 "Scroll cannot used the request cache":
-  - skip:
-      version: " - 6.99.99"
-      reason:  the error message has been added in v7.0.0
+
   - do:
       indices.create:
         index: test_scroll
@@ -217,9 +215,7 @@
 
 ---
 "Scroll with size 0":
-  - skip:
-      version: " - 6.1.99"
-      reason:  the error message has been added in v6.2.0
+
   - do:
       indices.create:
         index: test_scroll
@@ -237,9 +233,6 @@
 
 ---
 "Scroll max_score is null":
-  - skip:
-      version: " - 6.99.99"
-      reason:  max_score was set to 0 rather than null before 7.0
 
   - do:
       indices.create:
@@ -285,9 +278,7 @@
 
 ---
 "Scroll with new response format":
-  - skip:
-      version: " - 6.9.99"
-      reason: hits.total is returned as an object in 7.0.0
+
   - do:
       indices.create:
         index: test_scroll
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/12_slices.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/12_slices.yml
index f655b43b98949..3eed5dc74151d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/12_slices.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/12_slices.yml
@@ -103,9 +103,6 @@ setup:
 
 ---
 "Sliced scroll with invalid arguments":
-  - skip:
-      version: " - 6.99.99"
-      reason: Prior versions return 500 rather than 404
 
   - do:
         catch: bad_request
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml
index 2ce0bab7aba95..bf50e5bb25fa0 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml
@@ -651,10 +651,6 @@ setup:
 ---
 "Global ordinals are not loaded with the map execution hint":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  bug fixed in 7.0
-
   - do:
       index:
         refresh: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/290_geotile_grid.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/290_geotile_grid.yml
index 2db498a0cacf0..df663a0d8937c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/290_geotile_grid.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/290_geotile_grid.yml
@@ -1,7 +1,5 @@
 setup:
-  - skip:
-        version: " - 6.99.99"
-        reason:  "added in 7.0.0"
+
   - do:
       indices.create:
         include_type_name: false
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
index b1f093c138048..5b39730057f34 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
@@ -210,9 +210,6 @@ setup:
 
 ---
 "IP Range Key Generation":
-  - skip:
-     version: " - 6.3.99"
-     reason: "Before 6.4.0, ip_range did not always generate bucket keys (see #21045)."
 
   - do:
       search:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yml
index c32cae9ff8239..1c88758173936 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yml
@@ -31,9 +31,7 @@ setup:
 ---
 "Filter aggs with terms lookup and ensure it's cached":
   # Because the filter agg rewrites the terms lookup in the rewrite phase the request can be cached
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       search:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml
index ab17ddb66587e..09b34ba6ebc59 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml
@@ -207,8 +207,6 @@ setup:
 "Test typed keys parameter for date_histogram aggregation and max_bucket pipeline aggregation":
   - skip:
       features: warnings
-      version: " - 6.3.99"
-      reason:  "deprecation added in 6.4.0"
   - do:
       search:
         rest_total_hits_as_int: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml
index 629a6d4de34a1..7a3de2005c72d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml
@@ -11,9 +11,7 @@ setup:
 
 ---
 "Nested inner hits":
-    - skip:
-        version: " - 6.1.99"
-        reason: "<= 6.1 nodes don't always include index or id in nested inner hits"
+
     - do:
         index:
           index: test
@@ -43,10 +41,6 @@ setup:
 ---
 "Nested doc version and seqIDs":
 
-    - skip:
-        version: " - 6.99.99"
-        reason:  "Triggers warnings before 7.0"
-
     - do:
         index:
           index: test
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/10_source_filtering.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/10_source_filtering.yml
index 501fb1292da94..b15a48f52a43e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/10_source_filtering.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/10_source_filtering.yml
@@ -141,9 +141,7 @@ setup:
 
 ---
 "docvalue_fields":
-  - skip:
-      version: " - 6.9.99"
-      reason: Triggers a deprecation warning before 7.0
+
   - do:
       search:
         body:
@@ -152,9 +150,7 @@ setup:
 
 ---
 "multiple docvalue_fields":
-  - skip:
-      version: " - 6.9.99"
-      reason: Triggered a deprecation warning before 7.0
+
   - do:
       search:
         body:
@@ -163,9 +159,7 @@ setup:
 
 ---
 "docvalue_fields as url param":
-  - skip:
-      version: " - 6.99.99"
-      reason: Triggered a deprecation warning before 7.0
+
   - do:
       search:
         docvalue_fields: [ "count" ]
@@ -174,8 +168,6 @@ setup:
 ---
 "docvalue_fields with default format":
   - skip:
-      version: " - 6.99.99"
-      reason: Only triggers warnings on 7.0+
       features: warnings
   - do:
       warnings:
@@ -189,9 +181,7 @@ setup:
 
 ---
 "docvalue_fields with explicit format":
-  - skip:
-      version: " - 6.3.99"
-      reason: format option was added in 6.4
+
   - do:
       search:
         body:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml
index 99a7300abf1dd..a40ffe94d4ab5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml
@@ -248,10 +248,6 @@ setup:
 ---
 "no hits and inner_hits max_score null":
 
-  - skip:
-      version: " - 6.99.99"
-      reason:  max_score was set to 0 rather than null before 7.0
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -319,10 +315,6 @@ setup:
 ---
 "field collapsing, inner_hits and version":
 
-  - skip:
-      version: " - 6.1.0"
-      reason:  "bug fixed in 6.1.1"
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -371,9 +363,7 @@ setup:
 
 ---
 "field collapsing on a field alias":
-  - skip:
-      version: " - 6.3.99"
-      reason: Field aliases were introduced in 6.4.0.
+
   - do:
       indices.put_mapping:
         include_type_name: false
@@ -402,10 +392,6 @@ setup:
 ---
 "field collapsing, inner_hits and seq_no":
 
-  - skip:
-      version: " - 6.99.0"
-      reason:  "sequence numbers introduced in 7.0.0"
-
   - do:
       search:
         rest_total_hits_as_int: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/115_multiple_field_collapsing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/115_multiple_field_collapsing.yml
index b10401f48dbce..0b04385112af5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/115_multiple_field_collapsing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/115_multiple_field_collapsing.yml
@@ -1,8 +1,6 @@
 ---
 "two levels fields collapsing":
-    - skip:
-        version: " - 6.99.99"
-        reason: using multiple field collapsing from 7.0 on
+
     - do:
         indices.create:
           index: addresses
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query.yml
index d94e86bb6c565..183fefee80b96 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query.yml
@@ -588,9 +588,7 @@ setup:
 
 ---
 "Test exists query on _index field":
-  - skip:
-      version: " - 6.0.99"
-      reason: exists on _index not supported prior to 6.1.0
+
   - do:
       search:
           rest_total_hits_as_int: true
@@ -604,9 +602,7 @@ setup:
 
 ---
 "Test exists query on _type field":
-  - skip:
-      version: " - 6.0.99"
-      reason: exists on _type not supported prior to 6.1.0
+
   - do:
       search:
           rest_total_hits_as_int: true
@@ -646,9 +642,7 @@ setup:
 
 ---
 "Test exists query on _source field":
-  - skip:
-      version: " - 6.0.99"
-      reason: exists on _source not supported prior to 6.1.0
+
   - do:
       catch: /query_shard_exception/
       search:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/171_terms_query_with_types.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/171_terms_query_with_types.yml
index af9e276558a09..6c99cce0fe46a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/171_terms_query_with_types.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/171_terms_query_with_types.yml
@@ -1,8 +1,6 @@
 ---
 "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:
           include_type_name: true
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml
index fd4621e48cad3..7ee665a47a6ec 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml
@@ -76,9 +76,7 @@ setup:
 
 ---
 "Search with new response format":
-  - skip:
-      version: " - 6.99.99"
-      reason: hits.total is returned as an object in 7.0.0
+
   - do:
       search:
         body:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml
index 8d7a77cac8859..130e6d42504b4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml
@@ -1,7 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason:  "Implemented in 7.0"
 
   - do:
         indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/240_date_nanos.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/240_date_nanos.yml
index f5345ba57b1b7..1bbd7357f6869 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/240_date_nanos.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/240_date_nanos.yml
@@ -1,7 +1,5 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason:  "Implemented in 7.0"
+
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml
index 17735c7fd451a..f6bb812ea8669 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml
@@ -65,9 +65,6 @@ setup:
 ---
 "Docvalues_fields size limit":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: "Triggers warnings before 7.0"
   - do:
       catch:      /Trying to retrieve too many docvalue_fields\. Must be less than or equal to[:] \[2\] but was \[3\]\. This limit can be set by changing the \[index.max_docvalue_fields_search\] index level setting\./
       search:
@@ -99,9 +96,6 @@ setup:
 
 ---
 "Regexp length limit":
-  - skip:
-      version: " - 6.99.99"
-      reason: "The regex length limit was introduced in 7.0.0"
 
   - do:
       catch: /The length of regex \[1110\] used in the Regexp Query request has exceeded the allowed maximum of \[1000\]\. This maximum can be set by changing the \[index.max_regex_length\] index level setting\./
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yml
index 37d53fe8a6d59..614fedf7fc82e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yml
@@ -37,7 +37,6 @@ setup:
 ---
 "Indices boost using object":
   - skip:
-      reason: deprecation was added in 5.2.0
       features: "warnings"
 
   - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml
index 5b7ac56361cc1..0a5a7260a27a8 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml
@@ -40,9 +40,6 @@ setup:
 
 ---
 "Create a snapshot for missing index":
-  - skip:
-      version: " - 6.0.0"
-      reason: ignore_unavailable default is false in 6.0.0
 
   - do:
       catch: missing
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml
index aa15ca34ff0af..e2b7279f1cd68 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml
@@ -95,9 +95,6 @@ setup:
 
 ---
 "Get snapshot info contains include_global_state":
-  - skip:
-      version: " - 6.1.99"
-      reason: "include_global_state field has been added in the response in 6.2.0"
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/20_completion.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/20_completion.yml
index b64a51141dc6e..de28dc7f16bad 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/20_completion.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/20_completion.yml
@@ -292,9 +292,6 @@ setup:
 
 ---
 "Skip duplicates should work":
-  - skip:
-      version: " - 6.0.99"
-      reason: skip_duplicates was added in 6.1
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/30_context.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/30_context.yml
index e2c7ccfb421e3..6f3bae7f8e46f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/30_context.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/30_context.yml
@@ -277,9 +277,6 @@ setup:
 
 ---
 "Skip duplicates with contexts should work":
-  - skip:
-      version: " - 6.0.99"
-      reason: skip_duplicates was added in 6.1
 
   - do:
       index:
@@ -333,9 +330,6 @@ setup:
 
 ---
 "Indexing and Querying without contexts is forbidden":
-  - skip:
-      version: " - 6.99.99"
-      reason: this feature was removed in 7.0
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml
index 1742134af2b75..68cbc68552a91 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml
@@ -23,9 +23,7 @@
 ---
 "tasks_list headers":
   - skip:
-      version: " - 6.99.99"
       features: headers
-      reason:  task headers has been added in 7.0.0
 
   - do:
       headers: { "X-Opaque-Id": "That is me" }
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/10_basic.yml
index 62ec86118e5bb..23ec7eabfe128 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/10_basic.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-        version: " - 6.99.99"
-        reason: types are required in requests before 7.0.0
-
   - do:
       indices.create:
           index: testidx
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/20_issue7121.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/20_issue7121.yml
index 5f43e8a247923..eb7d335c28c60 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/20_issue7121.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/20_issue7121.yml
@@ -1,9 +1,3 @@
-setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
----
 "Term vector API should return 'found: false' for docs between index and refresh":
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/30_realtime.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/30_realtime.yml
index 0cb6dfc06904b..8bfbee483690c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/30_realtime.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/30_realtime.yml
@@ -1,9 +1,3 @@
-setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
----
 "Realtime Term Vectors":
 
  - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/50_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/50_mix_typeless_typeful.yml
index 4382442dee4dd..5801025654cf6 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/50_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/50_mix_typeless_typeful.yml
@@ -1,10 +1,6 @@
 ---
 "Term vectors 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
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/10_doc.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/10_doc.yml
index 3a35ad46f9161..13788af7e35c5 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/10_doc.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/10_doc.yml
@@ -1,9 +1,7 @@
 ---
 "Partial document":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
   - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yml
index 41dba3551e64c..5782c8286fb60 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yml
@@ -1,9 +1,7 @@
 ---
 "Update check shard header":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yml
index 657c036291bd6..6c69bc2aa993b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yml
@@ -1,9 +1,7 @@
 ---
 "Update result field":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       update:
           index:            test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yml
index a849eecc66629..39e2273d5cafb 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yml
@@ -1,9 +1,7 @@
 ---
 "Doc upsert":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       update:
           index:    test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yml
index 5bdc3ecea75fc..0d695cb754056 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yml
@@ -1,9 +1,7 @@
 ---
 "Doc as upsert":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       update:
           index:            test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yml
index 6f43d381e0537..1a91beebbb15d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yml
@@ -1,9 +1,7 @@
 ---
 "Routing":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
      indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yml
index 3a74f75f4f11d..77888fcbb2710 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yml
@@ -1,9 +1,7 @@
 ---
 "Refresh":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       indices.create:
@@ -52,9 +50,7 @@
 ---
 "When refresh url parameter is an empty string that means \"refresh immediately\"":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
@@ -85,9 +81,7 @@
 ---
 "refresh=wait_for waits until changes are visible in search":
 
- - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
 
  - do:
       index:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/80_source_filtering.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/80_source_filtering.yml
index 9e6d5a4671955..c8eeba967a6f7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/80_source_filtering.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/80_source_filtering.yml
@@ -1,9 +1,7 @@
 ---
 "Source filtering":
 
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
+
   - do:
       update:
           index:  test_1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/90_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/90_mix_typeless_typeful.yml
index 0ca25e8598c24..fff183daedc37 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/update/90_mix_typeless_typeful.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/update/90_mix_typeless_typeful.yml
@@ -1,10 +1,6 @@
 ---
 "Update 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
@@ -42,10 +38,6 @@
 ---
 "Update 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