diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
index fd1d7d3051226..4d9adf06763a7 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
@@ -362,7 +362,7 @@ private static void load(RestClient client, TestsDataset dataset, Logger logger,
         if (mapping == null) {
             throw new IllegalArgumentException("Cannot find resource " + mappingName);
         }
-        final String dataName = "/" + dataset.dataFileName;
+        final String dataName = "/data/" + dataset.dataFileName;
         URL data = CsvTestsDataLoader.class.getResource(dataName);
         if (data == null) {
             throw new IllegalArgumentException("Cannot find resource " + dataName);
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/addresses.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/addresses.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/addresses.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/addresses.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/ages.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/ages.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/ages.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/ages.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/airport_city_boundaries.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airport_city_boundaries.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/airport_city_boundaries.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airport_city_boundaries.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/airports.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/airports.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/airports_mp.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports_mp.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/airports_mp.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports_mp.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/airports_web.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports_web.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/airports_web.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/airports_web.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/alerts.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/alerts.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/alerts.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/alerts.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/apps.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/apps.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/apps.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/apps.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/books.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/books.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/books.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/books.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/cartesian_multipolygons.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/cartesian_multipolygons.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/cartesian_multipolygons.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/cartesian_multipolygons.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/client_cidr.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/client_cidr.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/client_cidr.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/client_cidr.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/clientips.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/clientips.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/clientips.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/clientips.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/countries_bbox.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/countries_bbox.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/countries_bbox.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/countries_bbox.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/countries_bbox_web.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/countries_bbox_web.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/countries_bbox_web.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/countries_bbox_web.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/date_nanos.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/date_nanos.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/date_nanos.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/date_nanos.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/decades.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/decades.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/decades.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/decades.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/distances.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/distances.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/distances.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/distances.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/employees.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/employees.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/employees.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/employees.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/employees_incompatible.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/employees_incompatible.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/employees_incompatible.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/employees_incompatible.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/heights.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/heights.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/heights.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/heights.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/hosts.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/hosts.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/hosts.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/hosts.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/k8s.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/k8s.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/k8s.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/languages.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/languages.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/languages.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/languages.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/languages_non_unique_key.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/languages_non_unique_key.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/languages_non_unique_key.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/languages_non_unique_key.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/message_types.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/message_types.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/message_types.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/message_types.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/missing_ip_sample_data.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/missing_ip_sample_data.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/missing_ip_sample_data.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/missing_ip_sample_data.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/multivalue_geometries.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/multivalue_geometries.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/multivalue_geometries.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/multivalue_geometries.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/multivalue_points.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/multivalue_points.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/multivalue_points.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/multivalue_points.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mv_sample_data.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/mv_sample_data.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/mv_sample_data.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/mv_sample_data.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_ts_long.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data_ts_long.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_ts_long.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data_ts_long.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_ts_nanos.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data_ts_nanos.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_ts_nanos.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/sample_data_ts_nanos.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/semantic_text.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/semantic_text.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/semantic_text.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/semantic_text.csv
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/ul_logs.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/ul_logs.csv
similarity index 100%
rename from x-pack/plugin/esql/qa/testFixtures/src/main/resources/ul_logs.csv
rename to x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/ul_logs.csv
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java
index 1b4c7fee9c7dd..bfa56b1896289 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java
@@ -423,7 +423,7 @@ private static CsvTestsDataLoader.TestsDataset testsDataset(LogicalPlan parsed)
     }
 
     private static TestPhysicalOperationProviders testOperationProviders(CsvTestsDataLoader.TestsDataset dataset) throws Exception {
-        var testData = loadPageFromCsv(CsvTests.class.getResource("/" + dataset.dataFileName()), dataset.typeMapping());
+        var testData = loadPageFromCsv(CsvTests.class.getResource("/data/" + dataset.dataFileName()), dataset.typeMapping());
         return new TestPhysicalOperationProviders(testData.v1(), testData.v2());
     }