diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml
index 4d8efe2a6f9d8..794ac3afa5096 100644
--- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml
+++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/random_sampler.yml
@@ -158,7 +158,9 @@ setup:
           {
             "query": {
               "function_score": {
-                "random_score": {}
+                "functions": {
+                    "random_score": {}
+                }
               }
             },
             "aggs": {
@@ -183,7 +185,9 @@ setup:
           {
             "query": {
               "function_score": {
-                "random_score": {}
+                "functions": {
+                  "random_score": {}
+                }
               }
             },
             "aggs": {
diff --git a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml
index acab855e17df6..8a7f1d8377359 100644
--- a/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml
+++ b/modules/aggregations/src/yamlRestTest/resources/rest-api-spec/test/aggregations/time_series.yml
@@ -161,10 +161,11 @@ setup:
         body:
           query:
             function_score:
-              field_value_factor:
-                field: "val"
-                factor: 0.1
-                missing: 1
+              functions:
+                field_value_factor:
+                  field: "val"
+                  factor: 0.1
+                  missing: 1
           size: 0
           min_score: 0.3
           aggs:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/610_function_score.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/610_function_score.yml
index 1f2e9fd3ad2da..45df7d367419b 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/610_function_score.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/610_function_score.yml
@@ -49,9 +49,11 @@
                   "text": "bar"
                 }
               },
-              "random_score": {
-                "seed": 10,
-                "field": "_seq_no"
+              "functions": {
+                "random_score": {
+                  "seed": 10,
+                  "field": "_seq_no"
+                }
               }
             }
 
@@ -70,9 +72,11 @@
                   "text": "bar"
                 }
               },
-              "random_score": {
-                "seed": 10,
-                "field": "uuid"
+              "functions": {
+                "random_score": {
+                  "seed": 10,
+                  "field": "_id"
+                }
               }
             }
 
@@ -132,8 +136,10 @@
                   "text": "bar"
                 }
               },
-              "random_score": {
-                "seed": 10
+              "functions": {
+                "random_score": {
+                  "seed": 10
+                }
               }
             }
   - length: { hits.hits: 2 }
@@ -172,11 +178,13 @@
               "query": {
                 "match_all": {}
               },
-              "field_value_factor": {
-                "field": "qty",
-                "factor": 1.2,
-                "missing": 1,
-                "modifier": "ln1p"
+              "functions": {
+                "field_value_factor": {
+                  "field": "qty",
+                  "factor": 1.2,
+                  "missing": 1,
+                  "modifier": "ln1p"
+                }
               }
             }
   - match: { status: 400 }