diff --git a/src/server/services/wfs/qgswfsdescribefeaturetype.cpp b/src/server/services/wfs/qgswfsdescribefeaturetype.cpp
index 7d77905f5905..26cb878a0547 100644
--- a/src/server/services/wfs/qgswfsdescribefeaturetype.cpp
+++ b/src/server/services/wfs/qgswfsdescribefeaturetype.cpp
@@ -79,7 +79,7 @@ namespace QgsWfs
     // test oFormat
     if ( oFormat == QgsWfsParameters::Format::NONE )
       throw QgsBadRequestException( QStringLiteral( "Invalid WFS Parameter" ),
-                                    "OUTPUTFORMAT " + wfsParameters.outputFormatAsString() + "is not supported" );
+                                    QStringLiteral( "OUTPUTFORMAT %1 is not supported" ).arg( wfsParameters.outputFormatAsString() ) );
 
     QgsAccessControl *accessControl = serverIface->accessControls();
 
@@ -346,6 +346,11 @@ namespace QgsWfs
           }
         }
 
+        if ( !( field.constraints().constraints() & QgsFieldConstraints::Constraint::ConstraintNotNull ) )
+        {
+          attElem.setAttribute( QStringLiteral( "nillable" ), QStringLiteral( "true" ) );
+        }
+
         sequenceElem.appendChild( attElem );
 
         QString alias = field.alias();
diff --git a/src/server/services/wfs/qgswfsgetfeature.cpp b/src/server/services/wfs/qgswfsgetfeature.cpp
index cea76b7b9c8a..eb96f8ce5f88 100644
--- a/src/server/services/wfs/qgswfsgetfeature.cpp
+++ b/src/server/services/wfs/qgswfsgetfeature.cpp
@@ -1334,16 +1334,16 @@ namespace QgsWfs
         {
           continue;
         }
-        if ( featureAttributes[idx].isNull() )
-        {
-          continue;
-        }
         const QgsField field = fields.at( idx );
         const QgsEditorWidgetSetup setup = field.editorWidgetSetup();
         QString attributeName = field.name();
 
         QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( ' ', '_' ).replace( cleanTagNameRegExp, QString() ) );
         QDomText fieldText = doc.createTextNode( encodeValueToText( featureAttributes[idx], setup ) );
+        if ( featureAttributes[idx].isNull() )
+        {
+          fieldElem.setAttribute( QStringLiteral( "xsi:nil" ), QStringLiteral( "true" ) );
+        }
         fieldElem.appendChild( fieldText );
         typeNameElement.appendChild( fieldElem );
       }
@@ -1435,16 +1435,18 @@ namespace QgsWfs
         {
           continue;
         }
-        if ( featureAttributes[idx].isNull() )
-        {
-          continue;
-        }
+
         const QgsField field = fields.at( idx );
         const QgsEditorWidgetSetup setup = field.editorWidgetSetup();
+
         QString attributeName = field.name();
 
         QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( ' ', '_' ).replace( cleanTagNameRegExp, QString() ) );
         QDomText fieldText = doc.createTextNode( encodeValueToText( featureAttributes[idx], setup ) );
+        if ( featureAttributes[idx].isNull() )
+        {
+          fieldElem.setAttribute( QStringLiteral( "xsi:nil" ), QStringLiteral( "true" ) );
+        }
         fieldElem.appendChild( fieldText );
         typeNameElement.appendChild( fieldElem );
       }
diff --git a/src/server/services/wfs/qgswfstransaction.cpp b/src/server/services/wfs/qgswfstransaction.cpp
index 450fd8d32eaa..19d5563cc664 100644
--- a/src/server/services/wfs/qgswfstransaction.cpp
+++ b/src/server/services/wfs/qgswfstransaction.cpp
@@ -411,6 +411,7 @@ namespace QgsWfs
           {
             if ( field.constraints().constraints() & QgsFieldConstraints::Constraint::ConstraintNotNull )
             {
+              action.error = true;
               action.errorMsg = QStringLiteral( "NOT NULL constraint error error on layer '%1', field '%2'" ).arg( typeName, field.name() );
               vlayer->rollBack();
               break;
diff --git a/src/server/services/wfs/qgswfstransaction_1_0_0.cpp b/src/server/services/wfs/qgswfstransaction_1_0_0.cpp
index 1ae9f14f6547..eec54fad7235 100644
--- a/src/server/services/wfs/qgswfstransaction_1_0_0.cpp
+++ b/src/server/services/wfs/qgswfstransaction_1_0_0.cpp
@@ -388,26 +388,50 @@ namespace QgsWfs
             }
             QgsField field = fields.at( fieldMapIt.value() );
             QVariant value = it.value();
-            if ( field.type() == 2 )
+            if ( value.isNull() )
             {
-              value = it.value().toInt( &conversionSuccess );
-              if ( !conversionSuccess )
+              if ( field.constraints().constraints() & QgsFieldConstraints::Constraint::ConstraintNotNull )
               {
                 action.error = true;
-                action.errorMsg = QStringLiteral( "Property conversion error on layer '%1'" ).arg( typeName );
+                action.errorMsg = QStringLiteral( "NOT NULL constraint error error on layer '%1', field '%2'" ).arg( typeName, field.name() );
                 vlayer->rollBack();
                 break;
               }
             }
-            else if ( field.type() == 6 )
+            else  // Not NULL
             {
-              value = it.value().toDouble( &conversionSuccess );
-              if ( !conversionSuccess )
+              if ( field.type() == QVariant::Type::Int )
               {
-                action.error = true;
-                action.errorMsg = QStringLiteral( "Property conversion error on layer '%1'" ).arg( typeName );
-                vlayer->rollBack();
-                break;
+                value = it.value().toInt( &conversionSuccess );
+                if ( !conversionSuccess )
+                {
+                  action.error = true;
+                  action.errorMsg = QStringLiteral( "Property conversion error on layer '%1'" ).arg( typeName );
+                  vlayer->rollBack();
+                  break;
+                }
+              }
+              else if ( field.type() == QVariant::Type::Double )
+              {
+                value = it.value().toDouble( &conversionSuccess );
+                if ( !conversionSuccess )
+                {
+                  action.error = true;
+                  action.errorMsg = QStringLiteral( "Property conversion error on layer '%1'" ).arg( typeName );
+                  vlayer->rollBack();
+                  break;
+                }
+              }
+              else if ( field.type() == QVariant::Type::LongLong )
+              {
+                value = it.value().toLongLong( &conversionSuccess );
+                if ( !conversionSuccess )
+                {
+                  action.error = true;
+                  action.errorMsg = QStringLiteral( "Property conversion error on layer '%1'" ).arg( typeName );
+                  vlayer->rollBack();
+                  break;
+                }
               }
             }
             vlayer->changeAttributeValue( feature.id(), fieldMapIt.value(), value );
diff --git a/tests/src/python/test_qgsserver_wfs.py b/tests/src/python/test_qgsserver_wfs.py
index 08719ab96d5f..e19ee68fdfbf 100644
--- a/tests/src/python/test_qgsserver_wfs.py
+++ b/tests/src/python/test_qgsserver_wfs.py
@@ -446,19 +446,19 @@ def test_describeFeatureType(self):
                                  'wfs_describeFeatureType_1_1_0_typename_wrong', project_file=project_file)
 
     def test_getFeatureFeature_0_nulls(self):
-        """Test that 0 and null in integer columns are reported correctly: note that WFS does not support NULL but QGIS Server does"""
+        """Test that 0 and null in integer columns are reported correctly"""
 
         # Test transactions with 0 and nulls
 
-        post_data = b"""<?xml version="1.0" ?>
-<wfs:Transaction service="WFS" version="1.1.0"
+        post_data = """<?xml version="1.0" ?>
+<wfs:Transaction service="WFS" version="{version}"
   xmlns:ogc="http://www.opengis.net/ogc"
   xmlns:wfs="http://www.opengis.net/wfs"
   xmlns:gml="http://www.opengis.net/gml">
    <wfs:Update typeName="cdb_lines">
       <wfs:Property>
-         <wfs:Name>id_long</wfs:Name>
-         <wfs:Value>%s</wfs:Value>
+         <wfs:Name>{field}</wfs:Name>
+         <wfs:Value>{value}</wfs:Value>
       </wfs:Property>
       <fes:Filter>
          <fes:FeatureId fid="cdb_lines.22"/>
@@ -467,37 +467,55 @@ def test_getFeatureFeature_0_nulls(self):
 </wfs:Transaction>
             """
 
-        def _round_trip(value):
-            """Set a value on fid 22 and long_id field and check it back"""
+        def _round_trip(value, field, version='1.1.0'):
+            """Set a value on fid 22 and field and check it back"""
 
-            header, body = self._execute_request("?MAP=%s&SERVICE=WFS" % (
-                self.testdata_path + 'test_project_wms_grouped_layers.qgs'), QgsServerRequest.PostMethod, post_data % value)
-            self.assertTrue(b'<TotalUpdated>1</TotalUpdated>' in body)
+            encoded_data = post_data.format(field=field, value=value, version=version).encode('utf8')
+            # Strip the field if NULL
+            if value is None:
+                encoded_data = encoded_data.replace(b'<wfs:Value>None</wfs:Value>', b'')
+
+            header, body = self._execute_request("?MAP=%s&SERVICE=WFS&VERSION=%s" % (
+                self.testdata_path + 'test_project_wms_grouped_layers.qgs', version), QgsServerRequest.PostMethod, encoded_data)
+            if version == '1.0.0':
+                self.assertTrue(b'<SUCCESS/>' in body, body)
+            else:
+                self.assertTrue(b'<TotalUpdated>1</TotalUpdated>' in body, body)
             header, body = self._execute_request("?MAP=%s&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cdb_lines&FEATUREID=cdb_lines.22" % (
                 self.testdata_path + 'test_project_wms_grouped_layers.qgs'))
-            self.assertTrue(b'<qgs:id_long>%s</qgs:id_long>' % value in body)
+            if value is not None:
+                xml_value = '<qgs:{0}>{1}</qgs:{0}>'.format(field, value).encode('utf8')
+                self.assertTrue(xml_value in body, "%s not found in body" % xml_value)
+            else:
+                xml_value = '<qgs:{0}>'.format(field).encode('utf8')
+                self.assertFalse(xml_value in body)
             # Check the backend
             vl = QgsVectorLayer(
                 self.testdata_path + 'test_project_wms_grouped_layers.gpkg|layername=cdb_lines', 'vl', 'ogr')
             self.assertTrue(vl.isValid())
-            self.assertEqual(str(vl.getFeature(22)['id_long']).encode(
-                'utf8'), value if value != b'' else b'NULL')
-
-        _round_trip(b'0')
-        _round_trip(b'12345')
-
-        # Now check NULL
-        header, body = self._execute_request("?MAP=%s&SERVICE=WFS" % (self.testdata_path + 'test_project_wms_grouped_layers.qgs'),
-                                             QgsServerRequest.PostMethod, (post_data % b'').replace(b'<wfs:Value></wfs:Value>', b''))
-        self.assertTrue(b'<TotalUpdated>1</TotalUpdated>' in body)
-        vl = QgsVectorLayer(
-            self.testdata_path + 'test_project_wms_grouped_layers.gpkg|layername=cdb_lines', 'vl', 'ogr')
-        self.assertTrue(vl.isValid())
-        self.assertTrue(vl.getFeature(22)['id_long'].isNull())
-        del(vl)
-        header, body = self._execute_request("?MAP=%s&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cdb_lines&FEATUREID=cdb_lines.22" % (
-            self.testdata_path + 'test_project_wms_grouped_layers.qgs'))
-        self.assertFalse(b'<qgs:id_long></qgs:id_long>' in body)
+            self.assertEqual(
+                str(vl.getFeature(22)[field]), value if value is not None else 'NULL')
+
+        for version in ('1.0.0', '1.1.0'):
+            _round_trip('0', 'id_long', version)
+            _round_trip('12345', 'id_long', version)
+            _round_trip('0', 'id', version)
+            _round_trip('12345', 'id', version)
+            _round_trip(None, 'id', version)
+            _round_trip(None, 'id_long', version)
+
+            # "name" is NOT NULL: try to set it to empty string
+            _round_trip('', 'name', version)
+            # Then NULL
+            data = post_data.format(field='name', value='', version=version).encode('utf8')
+            encoded_data = data.replace(b'<wfs:Value></wfs:Value>', b'')
+            header, body = self._execute_request("?MAP=%s&SERVICE=WFS" % (
+                self.testdata_path + 'test_project_wms_grouped_layers.qgs'), QgsServerRequest.PostMethod, encoded_data)
+            if version == '1.0.0':
+                self.assertTrue(b'<ERROR/>' in body, body)
+            else:
+                self.assertTrue(b'<TotalUpdated>0</TotalUpdated>' in body)
+            self.assertTrue(b'<Message>NOT NULL constraint error error on layer \'cdb_lines\', field \'name\'</Message>' in body)
 
 
 if __name__ == '__main__':
diff --git a/tests/testdata/qgis_server/test_project_wms_grouped_layers.gpkg b/tests/testdata/qgis_server/test_project_wms_grouped_layers.gpkg
index 228887819923..ca8521fe0ef2 100644
Binary files a/tests/testdata/qgis_server/test_project_wms_grouped_layers.gpkg and b/tests/testdata/qgis_server/test_project_wms_grouped_layers.gpkg differ
diff --git a/tests/testdata/qgis_server/wfs_describeFeatureType_1_0_0_typename_as_areas_1_0_0.txt b/tests/testdata/qgis_server/wfs_describeFeatureType_1_0_0_typename_as_areas_1_0_0.txt
index df7f64142e09..a12acb000cde 100644
--- a/tests/testdata/qgis_server/wfs_describeFeatureType_1_0_0_typename_as_areas_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_describeFeatureType_1_0_0_typename_as_areas_1_0_0.txt
@@ -1,4 +1,4 @@
-Content-Length: 1840
+Content-Length: 2176
 Content-Type: text/xml; charset=utf-8
 
 <schema xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.qgis.org/gml" xmlns:qgs="http://www.qgis.org/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
@@ -10,27 +10,27 @@ Content-Type: text/xml; charset=utf-8
     <sequence>
      <element maxOccurs="1" type="gml:MultiPolygonPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
-     <element type="int" name="gid"/>
-     <element type="string" name="datum"/>
-     <element type="string" name="bearbeiter"/>
-     <element type="string" name="veranstaltung"/>
-     <element type="string" name="beschriftung"/>
-     <element type="string" name="name"/>
-     <element type="string" name="flaechentyp"/>
-     <element type="string" name="farbe"/>
-     <element type="string" name="schraff_width"/>
-     <element type="string" name="schraff_width_prt"/>
-     <element type="string" name="schraff_size"/>
-     <element type="string" name="schraff_size_prt"/>
-     <element type="string" name="schraff_winkel"/>
-     <element type="string" name="umrissfarbe"/>
-     <element type="string" name="umrisstyp"/>
-     <element type="string" name="umrissstaerke"/>
-     <element type="string" name="umrissstaerke_prt"/>
-     <element type="decimal" name="umfang"/>
-     <element type="decimal" name="flaeche"/>
-     <element type="string" name="bemerkung"/>
-     <element type="string" name="last_change"/>
+     <element type="int" nillable="true" name="gid"/>
+     <element type="string" nillable="true" name="datum"/>
+     <element type="string" nillable="true" name="bearbeiter"/>
+     <element type="string" nillable="true" name="veranstaltung"/>
+     <element type="string" nillable="true" name="beschriftung"/>
+     <element type="string" nillable="true" name="name"/>
+     <element type="string" nillable="true" name="flaechentyp"/>
+     <element type="string" nillable="true" name="farbe"/>
+     <element type="string" nillable="true" name="schraff_width"/>
+     <element type="string" nillable="true" name="schraff_width_prt"/>
+     <element type="string" nillable="true" name="schraff_size"/>
+     <element type="string" nillable="true" name="schraff_size_prt"/>
+     <element type="string" nillable="true" name="schraff_winkel"/>
+     <element type="string" nillable="true" name="umrissfarbe"/>
+     <element type="string" nillable="true" name="umrisstyp"/>
+     <element type="string" nillable="true" name="umrissstaerke"/>
+     <element type="string" nillable="true" name="umrissstaerke_prt"/>
+     <element type="decimal" nillable="true" name="umfang"/>
+     <element type="decimal" nillable="true" name="flaeche"/>
+     <element type="string" nillable="true" name="bemerkung"/>
+     <element type="string" nillable="true" name="last_change"/>
     </sequence>
    </extension>
   </complexContent>
diff --git a/tests/testdata/qgis_server/wfs_describeFeatureType_1_0_0_typename_empty_1_0_0.txt b/tests/testdata/qgis_server/wfs_describeFeatureType_1_0_0_typename_empty_1_0_0.txt
index 3bec2baab7bf..127bbb2320ab 100644
--- a/tests/testdata/qgis_server/wfs_describeFeatureType_1_0_0_typename_empty_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_describeFeatureType_1_0_0_typename_empty_1_0_0.txt
@@ -1,4 +1,4 @@
-Content-Length: 4894
+Content-Length: 5913
 Content-Type: text/xml; charset=utf-8
 
 <schema xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.qgis.org/gml" xmlns:qgs="http://www.qgis.org/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
@@ -10,27 +10,27 @@ Content-Type: text/xml; charset=utf-8
     <sequence>
      <element maxOccurs="1" type="gml:MultiPolygonPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
-     <element type="int" name="gid"/>
-     <element type="string" name="datum"/>
-     <element type="string" name="bearbeiter"/>
-     <element type="string" name="veranstaltung"/>
-     <element type="string" name="beschriftung"/>
-     <element type="string" name="name"/>
-     <element type="string" name="flaechentyp"/>
-     <element type="string" name="farbe"/>
-     <element type="string" name="schraff_width"/>
-     <element type="string" name="schraff_width_prt"/>
-     <element type="string" name="schraff_size"/>
-     <element type="string" name="schraff_size_prt"/>
-     <element type="string" name="schraff_winkel"/>
-     <element type="string" name="umrissfarbe"/>
-     <element type="string" name="umrisstyp"/>
-     <element type="string" name="umrissstaerke"/>
-     <element type="string" name="umrissstaerke_prt"/>
-     <element type="decimal" name="umfang"/>
-     <element type="decimal" name="flaeche"/>
-     <element type="string" name="bemerkung"/>
-     <element type="string" name="last_change"/>
+     <element type="int" nillable="true" name="gid"/>
+     <element type="string" nillable="true" name="datum"/>
+     <element type="string" nillable="true" name="bearbeiter"/>
+     <element type="string" nillable="true" name="veranstaltung"/>
+     <element type="string" nillable="true" name="beschriftung"/>
+     <element type="string" nillable="true" name="name"/>
+     <element type="string" nillable="true" name="flaechentyp"/>
+     <element type="string" nillable="true" name="farbe"/>
+     <element type="string" nillable="true" name="schraff_width"/>
+     <element type="string" nillable="true" name="schraff_width_prt"/>
+     <element type="string" nillable="true" name="schraff_size"/>
+     <element type="string" nillable="true" name="schraff_size_prt"/>
+     <element type="string" nillable="true" name="schraff_winkel"/>
+     <element type="string" nillable="true" name="umrissfarbe"/>
+     <element type="string" nillable="true" name="umrisstyp"/>
+     <element type="string" nillable="true" name="umrissstaerke"/>
+     <element type="string" nillable="true" name="umrissstaerke_prt"/>
+     <element type="decimal" nillable="true" name="umfang"/>
+     <element type="decimal" nillable="true" name="flaeche"/>
+     <element type="string" nillable="true" name="bemerkung"/>
+     <element type="string" nillable="true" name="last_change"/>
     </sequence>
    </extension>
   </complexContent>
@@ -42,19 +42,19 @@ Content-Type: text/xml; charset=utf-8
     <sequence>
      <element maxOccurs="1" type="gml:PointPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
-     <element type="int" name="gid"/>
-     <element type="string" name="datum"/>
-     <element type="string" name="bearbeiter"/>
-     <element type="string" name="veranstaltung"/>
-     <element type="string" name="beschriftung"/>
-     <element type="string" name="name"/>
-     <element type="string" name="form"/>
-     <element type="string" name="groesse"/>
-     <element type="string" name="groesse_red"/>
-     <element type="string" name="winkel"/>
-     <element type="string" name="farbe"/>
-     <element type="string" name="bemerkung"/>
-     <element type="string" name="last_change"/>
+     <element type="int" nillable="true" name="gid"/>
+     <element type="string" nillable="true" name="datum"/>
+     <element type="string" nillable="true" name="bearbeiter"/>
+     <element type="string" nillable="true" name="veranstaltung"/>
+     <element type="string" nillable="true" name="beschriftung"/>
+     <element type="string" nillable="true" name="name"/>
+     <element type="string" nillable="true" name="form"/>
+     <element type="string" nillable="true" name="groesse"/>
+     <element type="string" nillable="true" name="groesse_red"/>
+     <element type="string" nillable="true" name="winkel"/>
+     <element type="string" nillable="true" name="farbe"/>
+     <element type="string" nillable="true" name="bemerkung"/>
+     <element type="string" nillable="true" name="last_change"/>
     </sequence>
    </extension>
   </complexContent>
@@ -66,30 +66,30 @@ Content-Type: text/xml; charset=utf-8
     <sequence>
      <element maxOccurs="1" type="gml:PointPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
-     <element type="decimal" name="AREA"/>
-     <element type="decimal" name="PERIMETER"/>
-     <element type="int" name="STADTTEILE"/>
-     <element type="int" name="STADTTEI_1"/>
-     <element type="int" name="S_A_"/>
-     <element type="int" name="S_A_ID"/>
-     <element type="string" name="O_NAME"/>
-     <element type="string" name="ORTSTEIL"/>
-     <element type="string" name="STADTTEIL"/>
-     <element type="string" name="OT_SCHL"/>
-     <element type="string" name="GEM_SCHL"/>
-     <element type="decimal" name="ZVS"/>
-     <element type="string" name="NAME"/>
-     <element type="string" name="PLZ"/>
-     <element type="string" name="KERNSTADT_"/>
-     <element type="string" name="ORTSRATSBE"/>
-     <element type="decimal" name="PLG_KITA"/>
-     <element type="decimal" name="PLG_BERATU"/>
-     <element type="decimal" name="PLG_JUFOE"/>
-     <element type="decimal" name="VERFLECHTU"/>
-     <element type="decimal" name="FUNKTIONSB"/>
-     <element type="string" name="T_DATUM"/>
-     <element type="string" name="Impfbez_Nr"/>
-     <element type="string" name="Impfzentru"/>
+     <element type="decimal" nillable="true" name="AREA"/>
+     <element type="decimal" nillable="true" name="PERIMETER"/>
+     <element type="int" nillable="true" name="STADTTEILE"/>
+     <element type="int" nillable="true" name="STADTTEI_1"/>
+     <element type="int" nillable="true" name="S_A_"/>
+     <element type="int" nillable="true" name="S_A_ID"/>
+     <element type="string" nillable="true" name="O_NAME"/>
+     <element type="string" nillable="true" name="ORTSTEIL"/>
+     <element type="string" nillable="true" name="STADTTEIL"/>
+     <element type="string" nillable="true" name="OT_SCHL"/>
+     <element type="string" nillable="true" name="GEM_SCHL"/>
+     <element type="decimal" nillable="true" name="ZVS"/>
+     <element type="string" nillable="true" name="NAME"/>
+     <element type="string" nillable="true" name="PLZ"/>
+     <element type="string" nillable="true" name="KERNSTADT_"/>
+     <element type="string" nillable="true" name="ORTSRATSBE"/>
+     <element type="decimal" nillable="true" name="PLG_KITA"/>
+     <element type="decimal" nillable="true" name="PLG_BERATU"/>
+     <element type="decimal" nillable="true" name="PLG_JUFOE"/>
+     <element type="decimal" nillable="true" name="VERFLECHTU"/>
+     <element type="decimal" nillable="true" name="FUNKTIONSB"/>
+     <element type="string" nillable="true" name="T_DATUM"/>
+     <element type="string" nillable="true" name="Impfbez_Nr"/>
+     <element type="string" nillable="true" name="Impfzentru"/>
     </sequence>
    </extension>
   </complexContent>
@@ -102,10 +102,10 @@ Content-Type: text/xml; charset=utf-8
      <element maxOccurs="1" type="gml:PolygonPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
      <element type="int" name="id"/>
-     <element type="string" name="typ"/>
+     <element type="string" nillable="true" name="typ"/>
      <element type="string" name="name"/>
-     <element type="string" name="ortsrat"/>
-     <element type="long" name="id_long"/>
+     <element type="string" nillable="true" name="ortsrat"/>
+     <element type="long" nillable="true" name="id_long"/>
     </sequence>
    </extension>
   </complexContent>
diff --git a/tests/testdata/qgis_server/wfs_describeFeatureType_1_1_0_typename_as_areas.txt b/tests/testdata/qgis_server/wfs_describeFeatureType_1_1_0_typename_as_areas.txt
index 793462009252..de89a2b93af9 100644
--- a/tests/testdata/qgis_server/wfs_describeFeatureType_1_1_0_typename_as_areas.txt
+++ b/tests/testdata/qgis_server/wfs_describeFeatureType_1_1_0_typename_as_areas.txt
@@ -1,4 +1,4 @@
-Content-Length: 1841
+Content-Length: 2177
 Content-Type: text/xml; charset=utf-8
 
 <schema xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.qgis.org/gml" xmlns:qgs="http://www.qgis.org/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
@@ -10,27 +10,27 @@ Content-Type: text/xml; charset=utf-8
     <sequence>
      <element maxOccurs="1" type="gml:MultiPolygonPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
-     <element type="int" name="gid"/>
-     <element type="string" name="datum"/>
-     <element type="string" name="bearbeiter"/>
-     <element type="string" name="veranstaltung"/>
-     <element type="string" name="beschriftung"/>
-     <element type="string" name="name"/>
-     <element type="string" name="flaechentyp"/>
-     <element type="string" name="farbe"/>
-     <element type="string" name="schraff_width"/>
-     <element type="string" name="schraff_width_prt"/>
-     <element type="string" name="schraff_size"/>
-     <element type="string" name="schraff_size_prt"/>
-     <element type="string" name="schraff_winkel"/>
-     <element type="string" name="umrissfarbe"/>
-     <element type="string" name="umrisstyp"/>
-     <element type="string" name="umrissstaerke"/>
-     <element type="string" name="umrissstaerke_prt"/>
-     <element type="decimal" name="umfang"/>
-     <element type="decimal" name="flaeche"/>
-     <element type="string" name="bemerkung"/>
-     <element type="string" name="last_change"/>
+     <element type="int" nillable="true" name="gid"/>
+     <element type="string" nillable="true" name="datum"/>
+     <element type="string" nillable="true" name="bearbeiter"/>
+     <element type="string" nillable="true" name="veranstaltung"/>
+     <element type="string" nillable="true" name="beschriftung"/>
+     <element type="string" nillable="true" name="name"/>
+     <element type="string" nillable="true" name="flaechentyp"/>
+     <element type="string" nillable="true" name="farbe"/>
+     <element type="string" nillable="true" name="schraff_width"/>
+     <element type="string" nillable="true" name="schraff_width_prt"/>
+     <element type="string" nillable="true" name="schraff_size"/>
+     <element type="string" nillable="true" name="schraff_size_prt"/>
+     <element type="string" nillable="true" name="schraff_winkel"/>
+     <element type="string" nillable="true" name="umrissfarbe"/>
+     <element type="string" nillable="true" name="umrisstyp"/>
+     <element type="string" nillable="true" name="umrissstaerke"/>
+     <element type="string" nillable="true" name="umrissstaerke_prt"/>
+     <element type="decimal" nillable="true" name="umfang"/>
+     <element type="decimal" nillable="true" name="flaeche"/>
+     <element type="string" nillable="true" name="bemerkung"/>
+     <element type="string" nillable="true" name="last_change"/>
     </sequence>
    </extension>
   </complexContent>
diff --git a/tests/testdata/qgis_server/wfs_describeFeatureType_1_1_0_typename_empty.txt b/tests/testdata/qgis_server/wfs_describeFeatureType_1_1_0_typename_empty.txt
index ca1226a2afe1..a4d01853ef5a 100644
--- a/tests/testdata/qgis_server/wfs_describeFeatureType_1_1_0_typename_empty.txt
+++ b/tests/testdata/qgis_server/wfs_describeFeatureType_1_1_0_typename_empty.txt
@@ -1,4 +1,4 @@
-Content-Length: 4895
+Content-Length: 5914
 Content-Type: text/xml; charset=utf-8
 
 <schema xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.qgis.org/gml" xmlns:qgs="http://www.qgis.org/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
@@ -10,27 +10,27 @@ Content-Type: text/xml; charset=utf-8
     <sequence>
      <element maxOccurs="1" type="gml:MultiPolygonPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
-     <element type="int" name="gid"/>
-     <element type="string" name="datum"/>
-     <element type="string" name="bearbeiter"/>
-     <element type="string" name="veranstaltung"/>
-     <element type="string" name="beschriftung"/>
-     <element type="string" name="name"/>
-     <element type="string" name="flaechentyp"/>
-     <element type="string" name="farbe"/>
-     <element type="string" name="schraff_width"/>
-     <element type="string" name="schraff_width_prt"/>
-     <element type="string" name="schraff_size"/>
-     <element type="string" name="schraff_size_prt"/>
-     <element type="string" name="schraff_winkel"/>
-     <element type="string" name="umrissfarbe"/>
-     <element type="string" name="umrisstyp"/>
-     <element type="string" name="umrissstaerke"/>
-     <element type="string" name="umrissstaerke_prt"/>
-     <element type="decimal" name="umfang"/>
-     <element type="decimal" name="flaeche"/>
-     <element type="string" name="bemerkung"/>
-     <element type="string" name="last_change"/>
+     <element type="int" nillable="true" name="gid"/>
+     <element type="string" nillable="true" name="datum"/>
+     <element type="string" nillable="true" name="bearbeiter"/>
+     <element type="string" nillable="true" name="veranstaltung"/>
+     <element type="string" nillable="true" name="beschriftung"/>
+     <element type="string" nillable="true" name="name"/>
+     <element type="string" nillable="true" name="flaechentyp"/>
+     <element type="string" nillable="true" name="farbe"/>
+     <element type="string" nillable="true" name="schraff_width"/>
+     <element type="string" nillable="true" name="schraff_width_prt"/>
+     <element type="string" nillable="true" name="schraff_size"/>
+     <element type="string" nillable="true" name="schraff_size_prt"/>
+     <element type="string" nillable="true" name="schraff_winkel"/>
+     <element type="string" nillable="true" name="umrissfarbe"/>
+     <element type="string" nillable="true" name="umrisstyp"/>
+     <element type="string" nillable="true" name="umrissstaerke"/>
+     <element type="string" nillable="true" name="umrissstaerke_prt"/>
+     <element type="decimal" nillable="true" name="umfang"/>
+     <element type="decimal" nillable="true" name="flaeche"/>
+     <element type="string" nillable="true" name="bemerkung"/>
+     <element type="string" nillable="true" name="last_change"/>
     </sequence>
    </extension>
   </complexContent>
@@ -42,19 +42,19 @@ Content-Type: text/xml; charset=utf-8
     <sequence>
      <element maxOccurs="1" type="gml:PointPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
-     <element type="int" name="gid"/>
-     <element type="string" name="datum"/>
-     <element type="string" name="bearbeiter"/>
-     <element type="string" name="veranstaltung"/>
-     <element type="string" name="beschriftung"/>
-     <element type="string" name="name"/>
-     <element type="string" name="form"/>
-     <element type="string" name="groesse"/>
-     <element type="string" name="groesse_red"/>
-     <element type="string" name="winkel"/>
-     <element type="string" name="farbe"/>
-     <element type="string" name="bemerkung"/>
-     <element type="string" name="last_change"/>
+     <element type="int" nillable="true" name="gid"/>
+     <element type="string" nillable="true" name="datum"/>
+     <element type="string" nillable="true" name="bearbeiter"/>
+     <element type="string" nillable="true" name="veranstaltung"/>
+     <element type="string" nillable="true" name="beschriftung"/>
+     <element type="string" nillable="true" name="name"/>
+     <element type="string" nillable="true" name="form"/>
+     <element type="string" nillable="true" name="groesse"/>
+     <element type="string" nillable="true" name="groesse_red"/>
+     <element type="string" nillable="true" name="winkel"/>
+     <element type="string" nillable="true" name="farbe"/>
+     <element type="string" nillable="true" name="bemerkung"/>
+     <element type="string" nillable="true" name="last_change"/>
     </sequence>
    </extension>
   </complexContent>
@@ -66,30 +66,30 @@ Content-Type: text/xml; charset=utf-8
     <sequence>
      <element maxOccurs="1" type="gml:PointPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
-     <element type="decimal" name="AREA"/>
-     <element type="decimal" name="PERIMETER"/>
-     <element type="int" name="STADTTEILE"/>
-     <element type="int" name="STADTTEI_1"/>
-     <element type="int" name="S_A_"/>
-     <element type="int" name="S_A_ID"/>
-     <element type="string" name="O_NAME"/>
-     <element type="string" name="ORTSTEIL"/>
-     <element type="string" name="STADTTEIL"/>
-     <element type="string" name="OT_SCHL"/>
-     <element type="string" name="GEM_SCHL"/>
-     <element type="decimal" name="ZVS"/>
-     <element type="string" name="NAME"/>
-     <element type="string" name="PLZ"/>
-     <element type="string" name="KERNSTADT_"/>
-     <element type="string" name="ORTSRATSBE"/>
-     <element type="decimal" name="PLG_KITA"/>
-     <element type="decimal" name="PLG_BERATU"/>
-     <element type="decimal" name="PLG_JUFOE"/>
-     <element type="decimal" name="VERFLECHTU"/>
-     <element type="decimal" name="FUNKTIONSB"/>
-     <element type="string" name="T_DATUM"/>
-     <element type="string" name="Impfbez_Nr"/>
-     <element type="string" name="Impfzentru"/>
+     <element type="decimal" nillable="true" name="AREA"/>
+     <element type="decimal" nillable="true" name="PERIMETER"/>
+     <element type="int" nillable="true" name="STADTTEILE"/>
+     <element type="int" nillable="true" name="STADTTEI_1"/>
+     <element type="int" nillable="true" name="S_A_"/>
+     <element type="int" nillable="true" name="S_A_ID"/>
+     <element type="string" nillable="true" name="O_NAME"/>
+     <element type="string" nillable="true" name="ORTSTEIL"/>
+     <element type="string" nillable="true" name="STADTTEIL"/>
+     <element type="string" nillable="true" name="OT_SCHL"/>
+     <element type="string" nillable="true" name="GEM_SCHL"/>
+     <element type="decimal" nillable="true" name="ZVS"/>
+     <element type="string" nillable="true" name="NAME"/>
+     <element type="string" nillable="true" name="PLZ"/>
+     <element type="string" nillable="true" name="KERNSTADT_"/>
+     <element type="string" nillable="true" name="ORTSRATSBE"/>
+     <element type="decimal" nillable="true" name="PLG_KITA"/>
+     <element type="decimal" nillable="true" name="PLG_BERATU"/>
+     <element type="decimal" nillable="true" name="PLG_JUFOE"/>
+     <element type="decimal" nillable="true" name="VERFLECHTU"/>
+     <element type="decimal" nillable="true" name="FUNKTIONSB"/>
+     <element type="string" nillable="true" name="T_DATUM"/>
+     <element type="string" nillable="true" name="Impfbez_Nr"/>
+     <element type="string" nillable="true" name="Impfzentru"/>
     </sequence>
    </extension>
   </complexContent>
@@ -102,10 +102,10 @@ Content-Type: text/xml; charset=utf-8
      <element maxOccurs="1" type="gml:PolygonPropertyType" minOccurs="0" name="geometry"/>
      <element type="long" name="fid"/>
      <element type="int" name="id"/>
-     <element type="string" name="typ"/>
+     <element type="string" nillable="true" name="typ"/>
      <element type="string" name="name"/>
-     <element type="string" name="ortsrat"/>
-     <element type="long" name="id_long"/>
+     <element type="string" nillable="true" name="ortsrat"/>
+     <element type="long" nillable="true" name="id_long"/>
     </sequence>
    </extension>
   </complexContent>
diff --git a/tests/testdata/qgis_server/wfs_describefeaturetype.txt b/tests/testdata/qgis_server/wfs_describefeaturetype.txt
index aa23590aba07..676bd43a43bb 100644
--- a/tests/testdata/qgis_server/wfs_describefeaturetype.txt
+++ b/tests/testdata/qgis_server/wfs_describefeaturetype.txt
@@ -1,4 +1,4 @@
-Content-Length: 911
+Content-Length: 959
 Content-Type: text/xml; charset=utf-8
 
 <schema xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.qgis.org/gml" xmlns:qgs="http://www.qgis.org/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
@@ -9,9 +9,9 @@ Content-Type: text/xml; charset=utf-8
    <extension base="gml:AbstractFeatureType">
     <sequence>
      <element maxOccurs="1" type="gml:PointPropertyType" minOccurs="0" name="geometry"/>
-     <element type="long" name="id"/>
-     <element type="string" name="name"/>
-     <element type="string" name="utf8nameè"/>
+     <element type="long" nillable="true" name="id"/>
+     <element type="string" nillable="true" name="name"/>
+     <element type="string" nillable="true" name="utf8nameè"/>
     </sequence>
    </extension>
   </complexContent>
diff --git a/tests/testdata/qgis_server/wfs_describefeaturetype_1_0_0.txt b/tests/testdata/qgis_server/wfs_describefeaturetype_1_0_0.txt
index 88b44989b4aa..5c0208a7bd3d 100644
--- a/tests/testdata/qgis_server/wfs_describefeaturetype_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_describefeaturetype_1_0_0.txt
@@ -1,4 +1,4 @@
-Content-Length: 910
+Content-Length: 958
 Content-Type: text/xml; charset=utf-8
 
 <schema xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.qgis.org/gml" xmlns:qgs="http://www.qgis.org/gml" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ogc="http://www.opengis.net/ogc" version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
@@ -9,9 +9,9 @@ Content-Type: text/xml; charset=utf-8
    <extension base="gml:AbstractFeatureType">
     <sequence>
      <element maxOccurs="1" type="gml:PointPropertyType" minOccurs="0" name="geometry"/>
-     <element type="long" name="id"/>
-     <element type="string" name="name"/>
-     <element type="string" name="utf8nameè"/>
+     <element type="long" nillable="true" name="id"/>
+     <element type="string" nillable="true" name="name"/>
+     <element type="string" nillable="true" name="utf8nameè"/>
     </sequence>
    </extension>
   </complexContent>
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_FID_one_1_0_0.txt b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_FID_one_1_0_0.txt
index 8ce42055ba53..57aba9b1040f 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_FID_one_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_FID_one_1_0_0.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_one_1_0_0.txt b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_one_1_0_0.txt
index 8ce42055ba53..57aba9b1040f 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_one_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_one_1_0_0.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_three_1_0_0.txt b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_three_1_0_0.txt
index cb174c88eefc..cf4781db3741 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_three_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_gml_bbox_three_1_0_0.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_two_1_0_0.txt b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_two_1_0_0.txt
index b3f3ff8c143c..38499b2f6200 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_two_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_EXP_FILTER_two_1_0_0.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_1_0_0.txt b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_1_0_0.txt
index 4f442c74a031..9571c80b3a90 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_1_0_0.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
 <wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA"
- timeStamp="2018-01-30T16:59:26"
+ timeStamp="2019-01-23T12:09:05"
  numberOfFeatures="1">
 </wfs:FeatureCollection>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_3857_1_0_0.txt b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_3857_1_0_0.txt
index 4f442c74a031..e7e1266cbc2c 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_3857_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_1_feature_3857_1_0_0.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA"
- timeStamp="2018-01-30T16:59:26"
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:3857&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA"
+ timeStamp="2019-01-23T12:09:05"
  numberOfFeatures="1">
 </wfs:FeatureCollection>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_1_0_0.txt b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_1_0_0.txt
index 5a3cb2e19cbc..23e74d3f4ea7 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_1_0_0.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
 <wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA"
- timeStamp="2018-01-30T16:59:26"
+ timeStamp="2019-01-23T12:09:05"
  numberOfFeatures="3">
 </wfs:FeatureCollection>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_3857_1_0_0.txt b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_3857_1_0_0.txt
index 5a3cb2e19cbc..a280ed9696dd 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_3857_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_0_0_epsgbbox_3_feature_3857_1_0_0.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA"
- timeStamp="2018-01-30T16:59:26"
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:3857&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA"
+ timeStamp="2019-01-23T12:09:05"
  numberOfFeatures="3">
 </wfs:FeatureCollection>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature.txt b/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature.txt
index abec008228df..7e47cbadc45c 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/3.1.1; charset=utf-8
 
 <wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.1.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=text/xml; subtype%3Dgml/3.1.1"
- timeStamp="2018-01-30T16:59:26"
+ timeStamp="2019-01-23T12:09:05"
  numberOfFeatures="1">
 </wfs:FeatureCollection>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature_3857.txt b/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature_3857.txt
index abec008228df..2d3d71d8ff32 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature_3857.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_1_feature_3857.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/3.1.1; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.1.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=text/xml; subtype%3Dgml/3.1.1"
- timeStamp="2018-01-30T16:59:26"
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:3857&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.1.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=text/xml; subtype%3Dgml/3.1.1"
+ timeStamp="2019-01-23T12:09:05"
  numberOfFeatures="1">
 </wfs:FeatureCollection>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature.txt b/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature.txt
index c5a67e329d8e..eb7e2e21ea40 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/3.1.1; charset=utf-8
 
 <wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.1.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=text/xml; subtype%3Dgml/3.1.1"
- timeStamp="2018-01-30T16:59:26"
+ timeStamp="2019-01-23T12:09:05"
  numberOfFeatures="3">
 </wfs:FeatureCollection>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature_3857.txt b/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature_3857.txt
index c5a67e329d8e..c1735f5f852e 100644
--- a/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature_3857.txt
+++ b/tests/testdata/qgis_server/wfs_getFeature_1_1_0_epsgbbox_3_feature_3857.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/3.1.1; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:4326&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.1.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=text/xml; subtype%3Dgml/3.1.1"
- timeStamp="2018-01-30T16:59:26"
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:3857&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.1.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=text/xml; subtype%3Dgml/3.1.1"
+ timeStamp="2019-01-23T12:09:05"
  numberOfFeatures="3">
 </wfs:FeatureCollection>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wfs_getcapabilities.txt b/tests/testdata/qgis_server/wfs_getcapabilities.txt
index a9194a3d21f7..bb44c41daeb2 100644
--- a/tests/testdata/qgis_server/wfs_getcapabilities.txt
+++ b/tests/testdata/qgis_server/wfs_getcapabilities.txt
@@ -1,4 +1,4 @@
-Content-Length: 6031
+Content-Length: 5776
 Content-Type: text/xml; charset=utf-8
 
 <WFS_Capabilities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns="http://www.opengis.net/wfs" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-capabilities.xsd" xmlns:ogc="http://www.opengis.net/ogc" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" updateSequence="0">
@@ -21,8 +21,8 @@ Content-Type: text/xml; charset=utf-8
   <ows:Operation name="GetCapabilities">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs"/>
-     <ows:Post xlink:href="?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs"/>
+     <ows:Get xlink:href="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
+     <ows:Post xlink:href="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
     </ows:HTTP>
    </ows:DCP>
    <ows:Parameter name="service">
@@ -39,8 +39,8 @@ Content-Type: text/xml; charset=utf-8
   <ows:Operation name="DescribeFeatureType">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs"/>
-     <ows:Post xlink:href="?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs"/>
+     <ows:Get xlink:href="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
+     <ows:Post xlink:href="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
     </ows:HTTP>
    </ows:DCP>
    <ows:Parameter name="outputFormat">
@@ -52,8 +52,8 @@ Content-Type: text/xml; charset=utf-8
   <ows:Operation name="GetFeature">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs"/>
-     <ows:Post xlink:href="?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs"/>
+     <ows:Get xlink:href="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
+     <ows:Post xlink:href="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
     </ows:HTTP>
    </ows:DCP>
    <ows:Parameter name="outputFormat">
@@ -69,8 +69,8 @@ Content-Type: text/xml; charset=utf-8
   <ows:Operation name="Transaction">
    <ows:DCP>
     <ows:HTTP>
-     <ows:Get xlink:href="?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs"/>
-     <ows:Post xlink:href="?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs"/>
+     <ows:Get xlink:href="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
+     <ows:Post xlink:href="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
     </ows:HTTP>
    </ows:DCP>
    <ows:Parameter name="inputFormat">
diff --git a/tests/testdata/qgis_server/wfs_getcapabilities_1_0_0.txt b/tests/testdata/qgis_server/wfs_getcapabilities_1_0_0.txt
index 7848d2a3d43e..c7411cd895fe 100644
--- a/tests/testdata/qgis_server/wfs_getcapabilities_1_0_0.txt
+++ b/tests/testdata/qgis_server/wfs_getcapabilities_1_0_0.txt
@@ -13,12 +13,12 @@ Content-Type: text/xml; charset=utf-8
    <GetCapabilities>
     <DCPType>
      <HTTP>
-      <Get onlineResource="?MAP=tests/testdata/qgis_server/test_project_wfs.qgs"/>
+      <Get onlineResource="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
      </HTTP>
     </DCPType>
     <DCPType>
      <HTTP>
-      <Post onlineResource="?MAP=tests/testdata/qgis_server/test_project_wfs.qgs"/>
+      <Post onlineResource="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
      </HTTP>
     </DCPType>
    </GetCapabilities>
@@ -28,12 +28,12 @@ Content-Type: text/xml; charset=utf-8
     </SchemaDescriptionLanguage>
     <DCPType>
      <HTTP>
-      <Get onlineResource="?MAP=tests/testdata/qgis_server/test_project_wfs.qgs"/>
+      <Get onlineResource="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
      </HTTP>
     </DCPType>
     <DCPType>
      <HTTP>
-      <Post onlineResource="?MAP=tests/testdata/qgis_server/test_project_wfs.qgs"/>
+      <Post onlineResource="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
      </HTTP>
     </DCPType>
    </DescribeFeatureType>
@@ -45,19 +45,19 @@ Content-Type: text/xml; charset=utf-8
     </ResultFormat>
     <DCPType>
      <HTTP>
-      <Get onlineResource="?MAP=tests/testdata/qgis_server/test_project_wfs.qgs"/>
+      <Get onlineResource="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
      </HTTP>
     </DCPType>
     <DCPType>
      <HTTP>
-      <Post onlineResource="?MAP=tests/testdata/qgis_server/test_project_wfs.qgs"/>
+      <Post onlineResource="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
      </HTTP>
     </DCPType>
    </GetFeature>
    <Transaction>
     <DCPType>
      <HTTP>
-      <Post onlineResource="?MAP=tests/testdata/qgis_server/test_project_wfs.qgs"/>
+      <Post onlineResource="?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs"/>
      </HTTP>
     </DCPType>
    </Transaction>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_bbox_inside_and_post.txt b/tests/testdata/qgis_server/wfs_getfeature_bbox_inside_and_post.txt
index 66241dcfb622..af1488a11029 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_bbox_inside_and_post.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_bbox_inside_and_post.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:3857&amp;SERVICE=WFS&amp;VERSION=1.1.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8,44 9,45</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_hits.txt b/tests/testdata/qgis_server/wfs_getfeature_hits.txt
index eea84f71890b..300f8e8be6f6 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_hits.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_hits.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA"
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;RESULTTYPE=hits&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA"
  timeStamp="****-**-**T**:**:**"
  numberOfFeatures="3">
 </wfs:FeatureCollection>
\ No newline at end of file
diff --git a/tests/testdata/qgis_server/wfs_getfeature_limit2.txt b/tests/testdata/qgis_server/wfs_getfeature_limit2.txt
index a31243d5ca1b..6697890ec084 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_limit2.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_limit2.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_limit2_post.txt b/tests/testdata/qgis_server/wfs_getfeature_limit2_post.txt
index c43e663daf4b..70fdb0cbf915 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_limit2_post.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_limit2_post.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8,44 9,45</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_nobbox.txt b/tests/testdata/qgis_server/wfs_getfeature_nobbox.txt
index 61b410ba5b2d..ff4868463b0b 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_nobbox.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_nobbox.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_nobbox_post.txt b/tests/testdata/qgis_server/wfs_getfeature_nobbox_post.txt
index 46713646cb02..4e6e233307bd 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_nobbox_post.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_nobbox_post.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8,44 9,45</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_sortby.txt b/tests/testdata/qgis_server/wfs_getfeature_sortby.txt
index d3c3db0c37d3..e6ffe4f2f4c7 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_sortby.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_sortby.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SORTBY=id D&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_sortby_post.txt b/tests/testdata/qgis_server/wfs_getfeature_sortby_post.txt
index 6f7b71725bc7..c1207746780b 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_sortby_post.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_sortby_post.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8,44 9,45</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_srs_two_layers_post.txt b/tests/testdata/qgis_server/wfs_getfeature_srs_two_layers_post.txt
index 5c0f85712046..c31d71fb0553 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_srs_two_layers_post.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_srs_two_layers_post.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/amorvan/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer,testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer,testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.203459,44.901395 8.203547,44.901483</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_srsname.txt b/tests/testdata/qgis_server/wfs_getfeature_srsname.txt
index a3398003ce8d..d90816276423 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_srsname.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_srsname.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:3857&amp;SERVICE=WFS&amp;VERSION=1.1.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:3857&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_srsname_post.txt b/tests/testdata/qgis_server/wfs_getfeature_srsname_post.txt
index c5c79ccd844c..4dc2557743a5 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_srsname_post.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_srsname_post.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/dhont/3liz_dev/QGIS/qgis_rldhont/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SRSNAME=EPSG:3857&amp;SERVICE=WFS&amp;VERSION=1.1.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8,44 9,45</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_start1_limit1.txt b/tests/testdata/qgis_server/wfs_getfeature_start1_limit1.txt
index 9330d945a0f7..b3f3ff8c143c 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_start1_limit1.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_start1_limit1.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_start1_limit1_post.txt b/tests/testdata/qgis_server/wfs_getfeature_start1_limit1_post.txt
index bb79c95ad83c..27a0aa6ebca2 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_start1_limit1_post.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_start1_limit1_post.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8,44 9,45</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_startindex2.txt b/tests/testdata/qgis_server/wfs_getfeature_startindex2.txt
index 83eee6a61b4d..cb174c88eefc 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_startindex2.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_startindex2.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8.20345931,44.90139484 8.20354699,44.90148253</gml:coordinates>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_startindex2_post.txt b/tests/testdata/qgis_server/wfs_getfeature_startindex2_post.txt
index 24c13e2bdc97..b30ff5c10dc2 100644
--- a/tests/testdata/qgis_server/wfs_getfeature_startindex2_post.txt
+++ b/tests/testdata/qgis_server/wfs_getfeature_startindex2_post.txt
@@ -1,6 +1,6 @@
 Content-Type: text/xml; subtype=gml/2.1.2; charset=utf-8
 
-<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
+<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:qgs="http://www.qgis.org/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/wfs.xsd http://www.qgis.org/gml ?MAP=/home/ale/dev/QGIS/tests/testdata/qgis_server/test_project_wfs.qgs&amp;SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=testlayer&amp;OUTPUTFORMAT=XMLSCHEMA">
 <gml:boundedBy>
  <gml:Box srsName="EPSG:4326">
   <gml:coordinates cs="," ts=" ">8,44 9,45</gml:coordinates>