diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py
index 6aa769769..5c817cee9 100644
--- a/jenkins_jobs/modules/triggers.py
+++ b/jenkins_jobs/modules/triggers.py
@@ -357,6 +357,10 @@ def gerrit(parser, xml_parent, data):
         parameters (default true)
     :arg bool no-name-and-email: Do not pass compound 'name and email'
         parameters (default false)
+    :arg bool readable-message: If parameters regarding multiline text,
+        e.g. commit message, should be as human readable or not. If false,
+        those parameters are Base64 encoded to keep environment variables
+        clean. (default false)
     :arg bool dynamic-trigger-enabled: Enable/disable the dynamic trigger
         (default false)
     :arg str dynamic-trigger-url: if you specify this option, the Gerrit
@@ -460,6 +464,8 @@ def gerrit(parser, xml_parent, data):
         data.get('escape-quotes', True)).lower()
     XML.SubElement(gtrig, 'noNameAndEmailParameters').text = str(
         data.get('no-name-and-email', False)).lower()
+    XML.SubElement(gtrig, 'readableMessage').text = str(
+        data.get('readable-message', False)).lower()
     XML.SubElement(gtrig, 'dynamicTriggerConfiguration').text = str(
         data.get('dynamic-trigger-enabled', False))
     XML.SubElement(gtrig, 'triggerConfigURL').text = str(
diff --git a/tests/triggers/fixtures/gerrit001.xml b/tests/triggers/fixtures/gerrit001.xml
index a28f89a21..11440d5e8 100644
--- a/tests/triggers/fixtures/gerrit001.xml
+++ b/tests/triggers/fixtures/gerrit001.xml
@@ -30,6 +30,7 @@
       <silentMode>false</silentMode>
       <escapeQuotes>false</escapeQuotes>
       <noNameAndEmailParameters>false</noNameAndEmailParameters>
+      <readableMessage>false</readableMessage>
       <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
       <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
       <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>
diff --git a/tests/triggers/fixtures/gerrit002.xml b/tests/triggers/fixtures/gerrit002.xml
index b7e3f68ef..1f7b19360 100644
--- a/tests/triggers/fixtures/gerrit002.xml
+++ b/tests/triggers/fixtures/gerrit002.xml
@@ -34,6 +34,7 @@
       <silentMode>false</silentMode>
       <escapeQuotes>false</escapeQuotes>
       <noNameAndEmailParameters>false</noNameAndEmailParameters>
+      <readableMessage>false</readableMessage>
       <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
       <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
       <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>
diff --git a/tests/triggers/fixtures/gerrit003.xml b/tests/triggers/fixtures/gerrit003.xml
index b3dcf366e..c3eab28c2 100644
--- a/tests/triggers/fixtures/gerrit003.xml
+++ b/tests/triggers/fixtures/gerrit003.xml
@@ -50,6 +50,7 @@
       <silentMode>false</silentMode>
       <escapeQuotes>false</escapeQuotes>
       <noNameAndEmailParameters>false</noNameAndEmailParameters>
+      <readableMessage>false</readableMessage>
       <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
       <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
       <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>
diff --git a/tests/triggers/fixtures/gerrit004.xml b/tests/triggers/fixtures/gerrit004.xml
index 151e43ba5..f5f484f80 100644
--- a/tests/triggers/fixtures/gerrit004.xml
+++ b/tests/triggers/fixtures/gerrit004.xml
@@ -40,6 +40,7 @@
       <silentMode>false</silentMode>
       <escapeQuotes>false</escapeQuotes>
       <noNameAndEmailParameters>false</noNameAndEmailParameters>
+      <readableMessage>false</readableMessage>
       <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
       <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
       <allowTriggeringUnreviewedPatches>true</allowTriggeringUnreviewedPatches>
diff --git a/tests/triggers/fixtures/gerrit005.xml b/tests/triggers/fixtures/gerrit005.xml
index 098f0c657..1a83dd471 100644
--- a/tests/triggers/fixtures/gerrit005.xml
+++ b/tests/triggers/fixtures/gerrit005.xml
@@ -30,6 +30,7 @@
       <silentMode>false</silentMode>
       <escapeQuotes>true</escapeQuotes>
       <noNameAndEmailParameters>false</noNameAndEmailParameters>
+      <readableMessage>false</readableMessage>
       <dynamicTriggerConfiguration>False</dynamicTriggerConfiguration>
       <triggerConfigURL/>
       <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>
diff --git a/tests/triggers/fixtures/gerrit006.xml b/tests/triggers/fixtures/gerrit006.xml
index 35580104a..ddf992c08 100644
--- a/tests/triggers/fixtures/gerrit006.xml
+++ b/tests/triggers/fixtures/gerrit006.xml
@@ -30,6 +30,7 @@
       <silentMode>false</silentMode>
       <escapeQuotes>false</escapeQuotes>
       <noNameAndEmailParameters>false</noNameAndEmailParameters>
+      <readableMessage>true</readableMessage>
       <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
       <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
       <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>
diff --git a/tests/triggers/fixtures/gerrit006.yaml b/tests/triggers/fixtures/gerrit006.yaml
index 9a98f7c0e..c5db411b9 100644
--- a/tests/triggers/fixtures/gerrit006.yaml
+++ b/tests/triggers/fixtures/gerrit006.yaml
@@ -19,5 +19,6 @@ triggers:
       silent: false
       escape-quotes: false
       no-name-and-email: false
+      readable-message: true
       dynamic-trigger-enabled: true
-      dynamic-trigger-url: http://myhost/mytrigger
\ No newline at end of file
+      dynamic-trigger-url: http://myhost/mytrigger
diff --git a/tests/triggers/fixtures/gerrit007.xml b/tests/triggers/fixtures/gerrit007.xml
index 62e1483c9..b563c8645 100644
--- a/tests/triggers/fixtures/gerrit007.xml
+++ b/tests/triggers/fixtures/gerrit007.xml
@@ -40,6 +40,7 @@
       <silentMode>false</silentMode>
       <escapeQuotes>false</escapeQuotes>
       <noNameAndEmailParameters>false</noNameAndEmailParameters>
+      <readableMessage>false</readableMessage>
       <dynamicTriggerConfiguration>True</dynamicTriggerConfiguration>
       <triggerConfigURL>http://myhost/mytrigger</triggerConfigURL>
       <allowTriggeringUnreviewedPatches>true</allowTriggeringUnreviewedPatches>
diff --git a/tests/yamlparser/fixtures/complete001.xml b/tests/yamlparser/fixtures/complete001.xml
index d556b97bf..d783e8f1a 100644
--- a/tests/yamlparser/fixtures/complete001.xml
+++ b/tests/yamlparser/fixtures/complete001.xml
@@ -73,6 +73,7 @@
       <silentMode>false</silentMode>
       <escapeQuotes>true</escapeQuotes>
       <noNameAndEmailParameters>false</noNameAndEmailParameters>
+      <readableMessage>false</readableMessage>
       <dynamicTriggerConfiguration>False</dynamicTriggerConfiguration>
       <triggerConfigURL/>
       <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>