diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_alias_json.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_alias_json.txt
index df9686c91b0..716b07545f7 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo_alias_json.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo_alias_json.txt
@@ -1,18 +1,15 @@
 *****
 Content-Type: application/json; charset=utf-8
 
-{"layers":[{
- "name": "fields_alias",
- "type": "FeatureCollection",
+{"type": "FeatureCollection",
     "features":[
 {
    "type":"Feature",
-   "id":2,
+   "id":"fields_alias.2",
    "geometry":null,
    "properties":{
       "alias_id":3,
       "alias_name":"three",
       "utf8nameè":"three èé↓"
    }
-}
-]}]}
+}]}
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_exclude_attribute_json.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_exclude_attribute_json.txt
index 07f6d13edef..c1fac2fa2e1 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo_exclude_attribute_json.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo_exclude_attribute_json.txt
@@ -1,17 +1,14 @@
 *****
 Content-Type: application/json; charset=utf-8
 
-{"layers":[{
- "name": "exclude_attribute",
- "type": "FeatureCollection",
+{"type": "FeatureCollection",
     "features":[
 {
    "type":"Feature",
-   "id":2,
+   "id":"exclude_attribute.2",
    "geometry":null,
    "properties":{
       "id":3,
       "utf8nameè":"three èé↓"
    }
-}
-]}]}
+}]}
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_geojson.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_geojson.txt
index 78a35c0744d..1dbeedb35d3 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo_geojson.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo_geojson.txt
@@ -1,19 +1,15 @@
 *****
 Content-Type: application/geo+json; charset=utf-8
 
-{
-"layers":[{
- "name": "testlayer èé",
- "type": "FeatureCollection",
+{"type": "FeatureCollection",
     "features":[
 {
    "type":"Feature",
-   "id":2,
+   "id":"testlayer èé.2",
    "geometry":null,
    "properties":{
       "id":3,
       "name":"three",
       "utf8nameè":"three èé↓"
    }
-}
-]}]}
+}]}
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_geometry_json.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_geometry_json.txt
index 2752c5169bf..496d99c615b 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo_geometry_json.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo_geometry_json.txt
@@ -1,13 +1,11 @@
 *****
 Content-Type: application/json; charset=utf-8
 
-{"layers":[{
- "name": "testlayer èé",
- "type": "FeatureCollection",
+{"type": "FeatureCollection",
     "features":[
 {
    "type":"Feature",
-   "id":2,
+   "id":"testlayer èé.2",
    "geometry":
    {"type": "Point", "coordinates": [8.203459, 44.901395]},
    "properties":{
@@ -15,5 +13,4 @@ Content-Type: application/json; charset=utf-8
       "name":"three",
       "utf8nameè":"three èé↓"
    }
-}
-]}]}
+}]}
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_json.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_json.txt
index 3e38c8566fa..11da0abc7c0 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo_json.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo_json.txt
@@ -1,19 +1,15 @@
 *****
 Content-Type: application/json; charset=utf-8
 
-{
-"layers":[{
- "name": "testlayer èé",
- "type": "FeatureCollection",
+{"type": "FeatureCollection",
     "features":[
 {
    "type":"Feature",
-   "id":2,
+   "id":"testlayer èé.2",
    "geometry":null,
    "properties":{
       "id":3,
       "name":"three",
       "utf8nameè":"three èé↓"
    }
-}
-]}]}
+}]}
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_multiple_json.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_multiple_json.txt
index f46db8f256a..5d1f7080042 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo_multiple_json.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo_multiple_json.txt
@@ -1,74 +1,58 @@
 *****
 Content-Type: application/json; charset=utf-8
 
-{"layers":[{
- "name": "testlayer èé",
- "type": "FeatureCollection",
+{"type": "FeatureCollection",
     "features":[
 {
    "type":"Feature",
-   "id":0,
+   "id":"testlayer èé.0",
    "geometry":null,
    "properties":{
       "id":1,
       "name":"one",
       "utf8nameè":"one èé"
    }
-},
-{
+},{
    "type":"Feature",
-   "id":1,
+   "id":"testlayer èé.1",
    "geometry":null,
    "properties":{
       "id":2,
       "name":"two",
       "utf8nameè":"two àò"
    }
-}
-]},{
- "name": "fields_alias",
- "type": "FeatureCollection",
-    "features":[
-{
+},{
    "type":"Feature",
-   "id":0,
+   "id":"fields_alias.0",
    "geometry":null,
    "properties":{
       "alias_id":1,
       "alias_name":"one",
       "utf8nameè":"one èé"
    }
-},
-{
+},{
    "type":"Feature",
-   "id":1,
+   "id":"fields_alias.1",
    "geometry":null,
    "properties":{
       "alias_id":2,
       "alias_name":"two",
       "utf8nameè":"two àò"
    }
-}
-]},{
- "name": "exclude_attribute",
- "type": "FeatureCollection",
-    "features":[
-{
+},{
    "type":"Feature",
-   "id":0,
+   "id":"exclude_attribute.0",
    "geometry":null,
    "properties":{
       "id":1,
       "utf8nameè":"one èé"
    }
-},
-{
+},{
    "type":"Feature",
-   "id":1,
+   "id":"exclude_attribute.1",
    "geometry":null,
    "properties":{
       "id":2,
       "utf8nameè":"two àò"
    }
-}
-]}]}
+}]}
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_raster_json.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_raster_json.txt
index 7886c0bcf93..85518d52018 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo_raster_json.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo_raster_json.txt
@@ -1,15 +1,19 @@
 *****
 Content-Type: application/json; charset=utf-8
 
-{"layers":[{
- "name": "landsat",
-"Band 1": "125",
-"Band 2": "138",
-"Band 3": "112",
-"Band 4": "75",
-"Band 5": "90",
-"Band 6": "132",
-"Band 7": "165",
-"Band 8": "217",
-"Band 9": "175"
+{"type": "FeatureCollection",
+    "features":[
+{"type":"Feature",
+"id":"landsat",
+"properties":{
+    "Band 1": "125",
+    "Band 2": "138",
+    "Band 3": "112",
+    "Band 4": "75",
+    "Band 5": "90",
+    "Band 6": "132",
+    "Band 7": "165",
+    "Band 8": "217",
+    "Band 9": "175"
+}
 }]}