diff --git a/tests/src/python/test_qgsserver_wms_getmap.py b/tests/src/python/test_qgsserver_wms_getmap.py
index 106ce35abaf..dca4afd45d4 100644
--- a/tests/src/python/test_qgsserver_wms_getmap.py
+++ b/tests/src/python/test_qgsserver_wms_getmap.py
@@ -852,7 +852,7 @@ class TestQgsServerWMSGetMap(QgsServerTestBase):
             "FILTER": "Country,Country_Diagrams: \"name\" IN ( 'africa , 'eurasia' );Hello: \"color\" IN ( 'magenta' , 'cerese' )"
         }.items())])
 
-        expected = self.strip_version_xmlns(b'<ServiceExceptionReport  >\n <ServiceException code="Filter string rejected">The filter string  "name" IN ( \'africa , \'eurasia\' ) has been rejected because of security reasons. Note: Text strings have to be enclosed in single or double quotes. A space between each word / special character is mandatory. Allowed Keywords and special characters are  AND,OR,IN,&lt;,>=,>,>=,!=,\',\',(,),DMETAPHONE,SOUNDEX. Not allowed are semicolons in the filter expression.</ServiceException>\n</ServiceExceptionReport>\n')
+        expected = self.strip_version_xmlns(b'<ServiceExceptionReport  >\n <ServiceException code="Security">The filter string  "name" IN ( \'africa , \'eurasia\' ) has been rejected because of security reasons. Note: Text strings have to be enclosed in single or double quotes. A space between each word / special character is mandatory. Allowed Keywords and special characters are  AND,OR,IN,&lt;,>=,>,>=,!=,\',\',(,),DMETAPHONE,SOUNDEX. Not allowed are semicolons in the filter expression.</ServiceException>\n</ServiceExceptionReport>\n')
         r, h = self._result(self._execute_request(qs))
 
         self.assertEqual(self.strip_version_xmlns(r), expected)
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo-group_name-notqueryable.txt b/tests/testdata/qgis_server/wms_getfeatureinfo-group_name-notqueryable.txt
index 6e96486d29e..ecb8df8dc70 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo-group_name-notqueryable.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo-group_name-notqueryable.txt
@@ -2,5 +2,5 @@
 Content-Type: text/xml; charset=utf-8
 
 <ServiceExceptionReport xmlns="http://www.opengis.net/ogc" version="1.3.0">
- <ServiceException code="LayerNotQueryable">Layer 'group_name' is not queryable</ServiceException>
-</ServiceExceptionReport>
\ No newline at end of file
+ <ServiceException code="LayerNotQueryable">The layer 'group_name' is not queryable.</ServiceException>
+</ServiceExceptionReport>
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo-groupwithoutshortname-notqueryable.txt b/tests/testdata/qgis_server/wms_getfeatureinfo-groupwithoutshortname-notqueryable.txt
index cb620e710b1..5eeee9ad1a5 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo-groupwithoutshortname-notqueryable.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo-groupwithoutshortname-notqueryable.txt
@@ -2,5 +2,5 @@
 Content-Type: text/xml; charset=utf-8
 
 <ServiceExceptionReport xmlns="http://www.opengis.net/ogc" version="1.3.0">
- <ServiceException code="LayerNotQueryable">Layer 'groupwithoutshortname' is not queryable</ServiceException>
-</ServiceExceptionReport>
\ No newline at end of file
+ <ServiceException code="LayerNotQueryable">The layer 'groupwithoutshortname' is not queryable.</ServiceException>
+</ServiceExceptionReport>
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo-invalid-format.txt b/tests/testdata/qgis_server/wms_getfeatureinfo-invalid-format.txt
index 442bd69ce7a..39508cb3c77 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo-invalid-format.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo-invalid-format.txt
@@ -2,5 +2,5 @@
 Content-Type: text/xml; charset=utf-8
 
 <ServiceExceptionReport version="1.3.0" xmlns="http://www.opengis.net/ogc">
- <ServiceException code="InvalidFormat">Invalid INFO_FORMAT parameter</ServiceException>
+ <ServiceException code="InvalidFormat">The format 'InvalidFormat' from INFO_FORMAT is not supported.</ServiceException>
 </ServiceExceptionReport>
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo-testlayer3-notqueryable.txt b/tests/testdata/qgis_server/wms_getfeatureinfo-testlayer3-notqueryable.txt
index 25df6eb0ea8..49eb69f1fab 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo-testlayer3-notqueryable.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo-testlayer3-notqueryable.txt
@@ -2,5 +2,5 @@
 Content-Type: text/xml; charset=utf-8
 
 <ServiceExceptionReport xmlns="http://www.opengis.net/ogc" version="1.3.0">
- <ServiceException code="LayerNotQueryable">Layer 'testlayer3' is not queryable</ServiceException>
-</ServiceExceptionReport>
\ No newline at end of file
+ <ServiceException code="LayerNotQueryable">The layer 'testlayer3' is not queryable.</ServiceException>
+</ServiceExceptionReport>
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_invalid_query_layers.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_invalid_query_layers.txt
index 4a2c5a00a11..73e8e4a2577 100644
--- a/tests/testdata/qgis_server/wms_getfeatureinfo_invalid_query_layers.txt
+++ b/tests/testdata/qgis_server/wms_getfeatureinfo_invalid_query_layers.txt
@@ -2,5 +2,5 @@
 Content-Type: text/xml; charset=utf-8
 
 <ServiceExceptionReport xmlns="http://www.opengis.net/ogc" version="1.3.0">
- <ServiceException code="LayerNotDefined">Layer 'InvalidLayer' not found</ServiceException>
+ <ServiceException code="LayerNotDefined">The layer 'InvalidLayer' does not exist.</ServiceException>
 </ServiceExceptionReport>