diff --git a/tests/src/python/test_qgsserver_wms_getfeatureinfo.py b/tests/src/python/test_qgsserver_wms_getfeatureinfo.py
index 18d2ba32c972..559185335fd9 100644
--- a/tests/src/python/test_qgsserver_wms_getfeatureinfo.py
+++ b/tests/src/python/test_qgsserver_wms_getfeatureinfo.py
@@ -445,7 +445,7 @@ def testGetFeatureInfoJSON(self):
         # simple test without geometry and info_format=application/geo+json
         self.wms_request_compare('GetFeatureInfo',
                                  '&layers=testlayer%20%C3%A8%C3%A9&styles=&' +
-                                 'info_format=application%2Fgeo+json&transparent=true&' +
+                                 'info_format=application%2Fgeo%2Bjson&transparent=true&' +
                                  'width=600&height=400&srs=EPSG%3A3857&bbox=913190.6389747962%2C' +
                                  '5606005.488876367%2C913235.426296057%2C5606035.347090538&' +
                                  'query_layers=testlayer%20%C3%A8%C3%A9&X=190&Y=320',
diff --git a/tests/testdata/qgis_server/getcapabilities.txt b/tests/testdata/qgis_server/getcapabilities.txt
index 5edd3cec9f87..576df8ee5246 100644
--- a/tests/testdata/qgis_server/getcapabilities.txt
+++ b/tests/testdata/qgis_server/getcapabilities.txt
@@ -136,7 +136,30 @@ Content-Type: text/xml; charset=utf-8
      <Title>default</Title>
      <LegendURL>
       <Format>image/png</Format>
-      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?MAP=tests/testdata/qgis_server/test_project.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=layer_with_short_name&amp;FORMAT=image/png&amp;STYLE=default" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+   </Layer>
+   <Layer queryable="1">
+    <Name>landsat</Name>
+    <Title>landsat</Title>
+    <CRS>CRS:84</CRS>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+     <westBoundLongitude>17.9243</westBoundLongitude>
+     <eastBoundLongitude>18.0457</eastBoundLongitude>
+     <southBoundLatitude>30.1519</southBoundLatitude>
+     <northBoundLatitude>30.2573</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox maxy="3.53666e+06" maxx="2.00883e+06" miny="3.52308e+06" CRS="EPSG:3857" minx="1.99532e+06"/>
+    <BoundingBox maxy="18.0457" maxx="30.2573" miny="17.9243" CRS="EPSG:4326" minx="30.1519"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
      </LegendURL>
     </Style>
    </Layer>
@@ -160,7 +183,55 @@ Content-Type: text/xml; charset=utf-8
      <Title>default</Title>
      <LegendURL>
       <Format>image/png</Format>
-      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?MAP=tests/testdata/qgis_server/test_project.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=testlayer èé&amp;FORMAT=image/png&amp;STYLE=default" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+   </Layer>
+   <Layer queryable="1">
+    <Name>fields_alias</Name>
+    <Title>A test vector layer</Title>
+    <Abstract>A test vector layer with unicode òà</Abstract>
+    <CRS>CRS:84</CRS>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+     <westBoundLongitude>8.20346</westBoundLongitude>
+     <eastBoundLongitude>8.20355</eastBoundLongitude>
+     <southBoundLatitude>44.9014</southBoundLatitude>
+     <northBoundLatitude>44.9015</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+   </Layer>
+   <Layer queryable="1">
+    <Name>exclude_attribute</Name>
+    <Title>A test vector layer</Title>
+    <Abstract>A test vector layer with unicode òà</Abstract>
+    <CRS>CRS:84</CRS>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+     <westBoundLongitude>8.20346</westBoundLongitude>
+     <eastBoundLongitude>8.20355</eastBoundLongitude>
+     <southBoundLatitude>44.9014</southBoundLatitude>
+     <northBoundLatitude>44.9015</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
      </LegendURL>
     </Style>
    </Layer>
@@ -180,28 +251,28 @@ Content-Type: text/xml; charset=utf-8
     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <Layer queryable="1">
-      <Name>testlayer2</Name>
-      <Title>testlayer2</Title>
-      <CRS>CRS:84</CRS>
-      <CRS>EPSG:4326</CRS>
-      <CRS>EPSG:3857</CRS>
-      <EX_GeographicBoundingBox>
-       <westBoundLongitude>8.20346</westBoundLongitude>
-       <eastBoundLongitude>8.20355</eastBoundLongitude>
-       <southBoundLatitude>44.9014</southBoundLatitude>
-       <northBoundLatitude>44.9015</northBoundLatitude>
-      </EX_GeographicBoundingBox>
-      <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
-      <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
-      <Style>
-       <Name>default</Name>
-       <Title>default</Title>
-       <LegendURL>
-        <Format>image/png</Format>
-        <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-       </LegendURL>
-      </Style>
-     </Layer>
+     <Name>testlayer2</Name>
+     <Title>testlayer2</Title>
+     <CRS>CRS:84</CRS>
+     <CRS>EPSG:4326</CRS>
+     <CRS>EPSG:3857</CRS>
+     <EX_GeographicBoundingBox>
+      <westBoundLongitude>8.20346</westBoundLongitude>
+      <eastBoundLongitude>8.20355</eastBoundLongitude>
+      <southBoundLatitude>44.9014</southBoundLatitude>
+      <northBoundLatitude>44.9015</northBoundLatitude>
+     </EX_GeographicBoundingBox>
+     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+     <Style>
+      <Name>default</Name>
+      <Title>default</Title>
+      <LegendURL>
+       <Format>image/png</Format>
+       <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+      </LegendURL>
+     </Style>
+    </Layer>
    </Layer>
    <Layer>
     <Name>groupwithoutshortname</Name>
@@ -218,28 +289,28 @@ Content-Type: text/xml; charset=utf-8
     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <Layer queryable="0">
-      <Name>testlayer3</Name>
-      <Title>testlayer3</Title>
-      <CRS>CRS:84</CRS>
-      <CRS>EPSG:4326</CRS>
-      <CRS>EPSG:3857</CRS>
-      <EX_GeographicBoundingBox>
-       <westBoundLongitude>8.20346</westBoundLongitude>
-       <eastBoundLongitude>8.20355</eastBoundLongitude>
-       <southBoundLatitude>44.9014</southBoundLatitude>
-       <northBoundLatitude>44.9015</northBoundLatitude>
-      </EX_GeographicBoundingBox>
-      <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
-      <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
-      <Style>
-       <Name>default</Name>
-       <Title>default</Title>
-       <LegendURL>
-        <Format>image/png</Format>
-        <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-       </LegendURL>
-      </Style>
-     </Layer>
+     <Name>testlayer3</Name>
+     <Title>testlayer3</Title>
+     <CRS>CRS:84</CRS>
+     <CRS>EPSG:4326</CRS>
+     <CRS>EPSG:3857</CRS>
+     <EX_GeographicBoundingBox>
+      <westBoundLongitude>8.20346</westBoundLongitude>
+      <eastBoundLongitude>8.20355</eastBoundLongitude>
+      <southBoundLatitude>44.9014</southBoundLatitude>
+      <northBoundLatitude>44.9015</northBoundLatitude>
+     </EX_GeographicBoundingBox>
+     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+     <Style>
+      <Name>default</Name>
+      <Title>default</Title>
+      <LegendURL>
+       <Format>image/png</Format>
+       <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+      </LegendURL>
+     </Style>
+    </Layer>
    </Layer>
   </Layer>
  </Capability>
diff --git a/tests/testdata/qgis_server/getcontext.txt b/tests/testdata/qgis_server/getcontext.txt
index 154e4ecf4156..66db29d53248 100644
--- a/tests/testdata/qgis_server/getcontext.txt
+++ b/tests/testdata/qgis_server/getcontext.txt
@@ -39,6 +39,34 @@ Content-Type: text/xml; charset=utf-8
     </Style>
    </StyleList>
   </Layer>
+  <Layer hidden="true" queryable="true" id="exclude_attribute" name="exclude_attribute" opacity="1">
+   <ows:Title>A test vector layer</ows:Title>
+   <ows:OutputFormat>image/png</ows:OutputFormat>
+   <Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
+    <OnlineResource xlink:href="https://www.qgis.org/?*****"/>
+   </Server>
+   <ows:Abstract>A test vector layer with unicode òà</ows:Abstract>
+   <StyleList>
+    <Style current="true">
+     <Name>default</Name>
+     <Title>default</Title>
+    </Style>
+   </StyleList>
+  </Layer>
+  <Layer hidden="true" queryable="true" id="fields_alias" name="fields_alias" opacity="1">
+   <ows:Title>A test vector layer</ows:Title>
+   <ows:OutputFormat>image/png</ows:OutputFormat>
+   <Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
+    <OnlineResource xlink:href="https://www.qgis.org/?*****"/>
+   </Server>
+   <ows:Abstract>A test vector layer with unicode òà</ows:Abstract>
+   <StyleList>
+    <Style current="true">
+     <Name>default</Name>
+     <Title>default</Title>
+    </Style>
+   </StyleList>
+  </Layer>
   <Layer hidden="true" queryable="true" id="testlayer_èé" name="testlayer èé" opacity="1">
    <ows:Title>A test vector layer</ows:Title>
    <ows:OutputFormat>image/png</ows:OutputFormat>
@@ -53,6 +81,19 @@ Content-Type: text/xml; charset=utf-8
     </Style>
    </StyleList>
   </Layer>
+  <Layer hidden="true" queryable="true" id="landsat" name="landsat" opacity="1">
+   <ows:Title>landsat</ows:Title>
+   <ows:OutputFormat>image/png</ows:OutputFormat>
+   <Server default="true" service="urn:ogc:serviceType:WMS" version="1.3.0">
+    <OnlineResource xlink:href="https://www.qgis.org/?*****"/>
+   </Server>
+   <StyleList>
+    <Style current="true">
+     <Name>default</Name>
+     <Title>default</Title>
+    </Style>
+   </StyleList>
+  </Layer>
   <Layer hidden="true" queryable="true" id="layer_with_short_name" name="layer_with_short_name" opacity="1">
    <ows:Title>A Layer with a short name</ows:Title>
    <ows:OutputFormat>image/png</ows:OutputFormat>
@@ -68,4 +109,4 @@ Content-Type: text/xml; charset=utf-8
    </StyleList>
   </Layer>
  </ResourceList>
-</OWSContext>
\ No newline at end of file
+</OWSContext>
diff --git a/tests/testdata/qgis_server/getprojectsettings.txt b/tests/testdata/qgis_server/getprojectsettings.txt
index e3a097ea22e2..44d826f69453 100644
--- a/tests/testdata/qgis_server/getprojectsettings.txt
+++ b/tests/testdata/qgis_server/getprojectsettings.txt
@@ -1,4 +1,4 @@
-Content-Length: 6939
+*****
 Content-Type: text/xml; charset=utf-8
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -168,6 +168,30 @@ Content-Type: text/xml; charset=utf-8
      <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
     </Attributes>
    </Layer>
+   <Layer queryable="1" visible="1">
+    <Name>landsat</Name>
+    <Title>landsat</Title>
+    <CRS>CRS:84</CRS>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+     <westBoundLongitude>17.9243</westBoundLongitude>
+     <eastBoundLongitude>18.0457</eastBoundLongitude>
+     <southBoundLatitude>30.1519</southBoundLatitude>
+     <northBoundLatitude>30.2573</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox maxy="3.53666e+06" maxx="2.00883e+06" miny="3.52308e+06" CRS="EPSG:3857" minx="1.99532e+06"/>
+    <BoundingBox maxy="18.0457" maxx="30.2573" miny="17.9243" CRS="EPSG:4326" minx="30.1519"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+    <TreeName>landsat</TreeName>
+   </Layer>
    <Layer geometryType="Point" queryable="1" displayField="name" visible="1">
     <Name>testlayer èé</Name>
     <Title>A test vector layer</Title>
@@ -198,6 +222,65 @@ Content-Type: text/xml; charset=utf-8
      <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
     </Attributes>
    </Layer>
+   <Layer geometryType="Point" queryable="1" displayField="alias_name" visible="1">
+    <Name>fields_alias</Name>
+    <Title>A test vector layer</Title>
+    <Abstract>A test vector layer with unicode òà</Abstract>
+    <CRS>CRS:84</CRS>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+     <westBoundLongitude>8.20346</westBoundLongitude>
+     <eastBoundLongitude>8.20355</eastBoundLongitude>
+     <southBoundLatitude>44.9014</southBoundLatitude>
+     <northBoundLatitude>44.9015</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+    <TreeName>fields_alias</TreeName>
+    <Attributes>
+     <Attribute precision="0" type="qlonglong" editType="TextEdit" typeName="Integer64" alias="alias_id" name="id" comment="" length="10"/>
+     <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" alias="alias_name" name="name" comment="" length="10"/>
+     <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
+    </Attributes>
+   </Layer>
+   <Layer geometryType="Point" queryable="1" displayField="name" visible="1">
+    <Name>exclude_attribute</Name>
+    <Title>A test vector layer</Title>
+    <Abstract>A test vector layer with unicode òà</Abstract>
+    <CRS>CRS:84</CRS>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+     <westBoundLongitude>8.20346</westBoundLongitude>
+     <eastBoundLongitude>8.20355</eastBoundLongitude>
+     <southBoundLatitude>44.9014</southBoundLatitude>
+     <northBoundLatitude>44.9015</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+    <TreeName>exclude_attribute</TreeName>
+    <Attributes>
+     <Attribute precision="0" type="qlonglong" editType="TextEdit" typeName="Integer64" name="id" comment="" length="10"/>
+     <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
+    </Attributes>
+   </Layer>
    <Layer mutuallyExclusive="0" visible="1">
     <Name>group_name</Name>
     <Title>Group title</Title>
@@ -290,6 +373,6 @@ Content-Type: text/xml; charset=utf-8
     </Layer>
    </Layer>
   </Layer>
-  <LayerDrawingOrder>testlayer3,testlayer2,testlayer èé,layer_with_short_name</LayerDrawingOrder>
+  <LayerDrawingOrder>testlayer3,testlayer2,exclude_attribute,fields_alias,testlayer èé,landsat,layer_with_short_name</LayerDrawingOrder>
  </Capability>
 </WMS_Capabilities>
diff --git a/tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt b/tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt
index 45f3772ac9b1..c52663bcc519 100644
--- a/tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt
+++ b/tests/testdata/qgis_server/wms_getcapabilities_1_1_1.txt
@@ -130,6 +130,24 @@ Content-Type: text/xml; charset=utf-8
      </LegendURL>
     </Style>
    </Layer>
+   <Layer queryable="1">
+    <Name>landsat</Name>
+    <Title>landsat</Title>
+    <SRS>CRS:84</SRS>
+    <SRS>EPSG:4326</SRS>
+    <SRS>EPSG:3857</SRS>
+    <LatLonBoundingBox maxy="30.2573" maxx="18.0457" miny="30.1519" minx="17.9243"/>
+    <BoundingBox maxy="3.53666e+06" SRS="EPSG:3857" maxx="2.00883e+06" miny="3.52308e+06" minx="1.99532e+06"/>
+    <BoundingBox maxy="30.2573" SRS="EPSG:4326" maxx="18.0457" miny="30.1519" minx="17.9243"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+   </Layer>
    <Layer queryable="1">
     <Name>testlayer èé</Name>
     <Title>A test vector layer</Title>
@@ -149,6 +167,44 @@ Content-Type: text/xml; charset=utf-8
      </LegendURL>
     </Style>
    </Layer>
+   <Layer queryable="1">
+    <Name>fields_alias</Name>
+    <Title>A test vector layer</Title>
+    <Abstract>A test vector layer with unicode òà</Abstract>
+    <SRS>CRS:84</SRS>
+    <SRS>EPSG:4326</SRS>
+    <SRS>EPSG:3857</SRS>
+    <LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
+    <BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
+    <BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+   </Layer>
+   <Layer queryable="1">
+    <Name>exclude_attribute</Name>
+    <Title>A test vector layer</Title>
+    <Abstract>A test vector layer with unicode òà</Abstract>
+    <SRS>CRS:84</SRS>
+    <SRS>EPSG:4326</SRS>
+    <SRS>EPSG:3857</SRS>
+    <LatLonBoundingBox maxy="44.9015" maxx="8.20355" miny="44.9014" minx="8.20346"/>
+    <BoundingBox maxy="5.60603e+06" SRS="EPSG:3857" maxx="913215" miny="5.60601e+06" minx="913205"/>
+    <BoundingBox maxy="44.9015" SRS="EPSG:4326" maxx="8.20355" miny="44.9014" minx="8.20346"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+   </Layer>
    <Layer>
     <Name>group_name</Name>
     <Title>Group title</Title>
diff --git a/tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt b/tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt
index 5edd3cec9f87..576df8ee5246 100644
--- a/tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt
+++ b/tests/testdata/qgis_server/wms_getcapabilities_1_3_0.txt
@@ -136,7 +136,30 @@ Content-Type: text/xml; charset=utf-8
      <Title>default</Title>
      <LegendURL>
       <Format>image/png</Format>
-      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?MAP=tests/testdata/qgis_server/test_project.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=layer_with_short_name&amp;FORMAT=image/png&amp;STYLE=default" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+   </Layer>
+   <Layer queryable="1">
+    <Name>landsat</Name>
+    <Title>landsat</Title>
+    <CRS>CRS:84</CRS>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+     <westBoundLongitude>17.9243</westBoundLongitude>
+     <eastBoundLongitude>18.0457</eastBoundLongitude>
+     <southBoundLatitude>30.1519</southBoundLatitude>
+     <northBoundLatitude>30.2573</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox maxy="3.53666e+06" maxx="2.00883e+06" miny="3.52308e+06" CRS="EPSG:3857" minx="1.99532e+06"/>
+    <BoundingBox maxy="18.0457" maxx="30.2573" miny="17.9243" CRS="EPSG:4326" minx="30.1519"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
      </LegendURL>
     </Style>
    </Layer>
@@ -160,7 +183,55 @@ Content-Type: text/xml; charset=utf-8
      <Title>default</Title>
      <LegendURL>
       <Format>image/png</Format>
-      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?MAP=tests/testdata/qgis_server/test_project.qgs&amp;SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetLegendGraphic&amp;LAYER=testlayer èé&amp;FORMAT=image/png&amp;STYLE=default" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+   </Layer>
+   <Layer queryable="1">
+    <Name>fields_alias</Name>
+    <Title>A test vector layer</Title>
+    <Abstract>A test vector layer with unicode òà</Abstract>
+    <CRS>CRS:84</CRS>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+     <westBoundLongitude>8.20346</westBoundLongitude>
+     <eastBoundLongitude>8.20355</eastBoundLongitude>
+     <southBoundLatitude>44.9014</southBoundLatitude>
+     <northBoundLatitude>44.9015</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+     </LegendURL>
+    </Style>
+   </Layer>
+   <Layer queryable="1">
+    <Name>exclude_attribute</Name>
+    <Title>A test vector layer</Title>
+    <Abstract>A test vector layer with unicode òà</Abstract>
+    <CRS>CRS:84</CRS>
+    <CRS>EPSG:4326</CRS>
+    <CRS>EPSG:3857</CRS>
+    <EX_GeographicBoundingBox>
+     <westBoundLongitude>8.20346</westBoundLongitude>
+     <eastBoundLongitude>8.20355</eastBoundLongitude>
+     <southBoundLatitude>44.9014</southBoundLatitude>
+     <northBoundLatitude>44.9015</northBoundLatitude>
+    </EX_GeographicBoundingBox>
+    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+    <Style>
+     <Name>default</Name>
+     <Title>default</Title>
+     <LegendURL>
+      <Format>image/png</Format>
+      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
      </LegendURL>
     </Style>
    </Layer>
@@ -180,28 +251,28 @@ Content-Type: text/xml; charset=utf-8
     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <Layer queryable="1">
-      <Name>testlayer2</Name>
-      <Title>testlayer2</Title>
-      <CRS>CRS:84</CRS>
-      <CRS>EPSG:4326</CRS>
-      <CRS>EPSG:3857</CRS>
-      <EX_GeographicBoundingBox>
-       <westBoundLongitude>8.20346</westBoundLongitude>
-       <eastBoundLongitude>8.20355</eastBoundLongitude>
-       <southBoundLatitude>44.9014</southBoundLatitude>
-       <northBoundLatitude>44.9015</northBoundLatitude>
-      </EX_GeographicBoundingBox>
-      <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
-      <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
-      <Style>
-       <Name>default</Name>
-       <Title>default</Title>
-       <LegendURL>
-        <Format>image/png</Format>
-        <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-       </LegendURL>
-      </Style>
-     </Layer>
+     <Name>testlayer2</Name>
+     <Title>testlayer2</Title>
+     <CRS>CRS:84</CRS>
+     <CRS>EPSG:4326</CRS>
+     <CRS>EPSG:3857</CRS>
+     <EX_GeographicBoundingBox>
+      <westBoundLongitude>8.20346</westBoundLongitude>
+      <eastBoundLongitude>8.20355</eastBoundLongitude>
+      <southBoundLatitude>44.9014</southBoundLatitude>
+      <northBoundLatitude>44.9015</northBoundLatitude>
+     </EX_GeographicBoundingBox>
+     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+     <Style>
+      <Name>default</Name>
+      <Title>default</Title>
+      <LegendURL>
+       <Format>image/png</Format>
+       <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+      </LegendURL>
+     </Style>
+    </Layer>
    </Layer>
    <Layer>
     <Name>groupwithoutshortname</Name>
@@ -218,28 +289,28 @@ Content-Type: text/xml; charset=utf-8
     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <Layer queryable="0">
-      <Name>testlayer3</Name>
-      <Title>testlayer3</Title>
-      <CRS>CRS:84</CRS>
-      <CRS>EPSG:4326</CRS>
-      <CRS>EPSG:3857</CRS>
-      <EX_GeographicBoundingBox>
-       <westBoundLongitude>8.20346</westBoundLongitude>
-       <eastBoundLongitude>8.20355</eastBoundLongitude>
-       <southBoundLatitude>44.9014</southBoundLatitude>
-       <northBoundLatitude>44.9015</northBoundLatitude>
-      </EX_GeographicBoundingBox>
-      <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
-      <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
-      <Style>
-       <Name>default</Name>
-       <Title>default</Title>
-       <LegendURL>
-        <Format>image/png</Format>
-        <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-       </LegendURL>
-      </Style>
-     </Layer>
+     <Name>testlayer3</Name>
+     <Title>testlayer3</Title>
+     <CRS>CRS:84</CRS>
+     <CRS>EPSG:4326</CRS>
+     <CRS>EPSG:3857</CRS>
+     <EX_GeographicBoundingBox>
+      <westBoundLongitude>8.20346</westBoundLongitude>
+      <eastBoundLongitude>8.20355</eastBoundLongitude>
+      <southBoundLatitude>44.9014</southBoundLatitude>
+      <northBoundLatitude>44.9015</northBoundLatitude>
+     </EX_GeographicBoundingBox>
+     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
+     <Style>
+      <Name>default</Name>
+      <Title>default</Title>
+      <LegendURL>
+       <Format>image/png</Format>
+       <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+      </LegendURL>
+     </Style>
+    </Layer>
    </Layer>
   </Layer>
  </Capability>
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_json.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_json.txt
index 957884181fd9..3e38c8566fa0 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo_json.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo_json.txt
@@ -1,7 +1,8 @@
 *****
 Content-Type: application/json; charset=utf-8
 
-{"layers":[{
+{
+"layers":[{
  "name": "testlayer èé",
  "type": "FeatureCollection",
     "features":[