diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml
index 5c0985c7d1dd4..eda0573b0d591 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/360_date_histogram.yml
@@ -65,7 +65,8 @@ setup:
 ---
 "Date histogram aggregation w/ filter query test":
   - skip:
-    version: " - 2.16.99"
+      version: " - 2.16.99"
+      reason: Fixed in 2.17 - backport to 2.16
 
   - do:
       bulk:
@@ -73,15 +74,15 @@ setup:
         index: dhisto-agg-w-query
         body:
           - '{"index": {}}'
-          - '{"routing": "route1", "date": "2024-08-12"}'
+          - '{"routing": "route1", "date": "2024-08-12", "dow": "monday"}'
           - '{"index": {}}'
-          - '{"routing": "route1", "date": "2024-08-14"}'
+          - '{"routing": "route1", "date": "2024-08-14", "dow": "wednesday"}'
           - '{"index": {}}'
-          - '{"routing": "route1", "date": "2024-08-19"}'
+          - '{"routing": "route1", "date": "2024-08-19", "dow": "monday"}'
           - '{"index": {}}'
-          - '{"routing": "route2", "date": "2024-08-13"}'
+          - '{"routing": "route2", "date": "2024-08-13", "dow": "tuesday"}'
           - '{"index": {}}'
-          - '{"routing": "route2", "date": "2024-08-15"}'
+          - '{"routing": "route2", "date": "2024-08-15", "dow": "thursday"}'
 
   - do:
       search:
@@ -103,14 +104,11 @@ setup:
           _source: false
 
   - match: { hits.total.value: 3 }
-  - match: { aggregations.weekHisto.buckets.0.doc_count: 1 }
+  - match: { aggregations.weekHisto.buckets.0.doc_count: 2 }
   - match: { aggregations.weekHisto.buckets.1.doc_count: 1 }
 
 ---
 "Date histogram aggregation w/ shared field range test":
-  - skip:
-    version: " - 2.16.99"
-
   - do:
       bulk:
         refresh: true
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 1c107f6a79476..aeda005425d16 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
@@ -677,7 +677,8 @@ setup:
 ---
 "Filter query w/ aggregation test":
   - skip:
-    version: " - 2.16.99"
+      version: " - 2.16.99"
+      reason: Fixed in 2.17 - backport to 2.16
   - do:
       bulk:
         refresh: true