diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/derived_fields/10_derived_field_index_mapping_definition.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/derived_fields/10_derived_field_index_mapping_definition.yml
similarity index 99%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/derived_fields/10_derived_field_index_mapping_definition.yml
rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/derived_fields/10_derived_field_index_mapping_definition.yml
index 0d6725dc5a353..287e992183d38 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/derived_fields/10_derived_field_index_mapping_definition.yml
+++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/derived_fields/10_derived_field_index_mapping_definition.yml
@@ -401,4 +401,4 @@
               derived_object.array_of_long:
                 gte: 3
 
-  - match: { hits.total: 4 }
+  - match: { hits.total: 3 }
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/derived_fields/20_derived_field_put_mapping.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/derived_fields/20_derived_field_put_mapping.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/derived_fields/20_derived_field_put_mapping.yml
rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/derived_fields/20_derived_field_put_mapping.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/derived_fields/30_derived_field_search_definition.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/derived_fields/30_derived_field_search_definition.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/derived_fields/30_derived_field_search_definition.yml
rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/derived_fields/30_derived_field_search_definition.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/derived_fields/40_derived_field_fetch_and_highlight.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/derived_fields/40_derived_field_fetch_and_highlight.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/derived_fields/40_derived_field_fetch_and_highlight.yml
rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/derived_fields/40_derived_field_fetch_and_highlight.yml