diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py
index 53e475053..3e5e5999b 100644
--- a/jenkins_jobs/modules/wrappers.py
+++ b/jenkins_jobs/modules/wrappers.py
@@ -1819,22 +1819,29 @@ def xvnc(parser, xml_parent, data):
     Enable xvnc during the build.
     Requires the Jenkins :jenkins-wiki:`xvnc plugin <Xvnc+Plugin>`.
 
-    :arg bool screenshot: Take screenshot upon build completion
-                          (default false)
-    :arg bool xauthority: Create a dedicated Xauthority file per build
-                          (default true)
+    :arg bool screenshot: Take screenshot upon build completion (default false)
+    :arg bool xauthority: Create a dedicated Xauthority file per build (default
+        true)
 
-    Example:
+    Full Example:
 
-    .. literalinclude:: /../../tests/wrappers/fixtures/xvnc001.yaml
+    .. literalinclude:: /../../tests/wrappers/fixtures/xvnc-full.yaml
+       :language: yaml
 
+    Minimal Example:
+
+    .. literalinclude:: /../../tests/wrappers/fixtures/xvnc-minimal.yaml
+       :language: yaml
     """
     xwrapper = XML.SubElement(xml_parent,
                               'hudson.plugins.xvnc.Xvnc')
-    XML.SubElement(xwrapper, 'takeScreenshot').text = str(
-        data.get('screenshot', False)).lower()
-    XML.SubElement(xwrapper, 'useXauthority').text = str(
-        data.get('xauthority', True)).lower()
+    xwrapper.set('plugin', 'xvnc')
+
+    mapping = [
+        ('screenshot', 'takeScreenshot', False),
+        ('xauthority', 'useXauthority', True),
+    ]
+    convert_mapping_to_xml(xwrapper, data, mapping, fail_required=True)
 
 
 def job_log_logger(parser, xml_parent, data):
diff --git a/tests/wrappers/fixtures/xvnc001.xml b/tests/wrappers/fixtures/xvnc-full.xml
similarity index 82%
rename from tests/wrappers/fixtures/xvnc001.xml
rename to tests/wrappers/fixtures/xvnc-full.xml
index 42095a035..82bb61f41 100644
--- a/tests/wrappers/fixtures/xvnc001.xml
+++ b/tests/wrappers/fixtures/xvnc-full.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
   <buildWrappers>
-    <hudson.plugins.xvnc.Xvnc>
+    <hudson.plugins.xvnc.Xvnc plugin="xvnc">
       <takeScreenshot>true</takeScreenshot>
       <useXauthority>false</useXauthority>
     </hudson.plugins.xvnc.Xvnc>
diff --git a/tests/wrappers/fixtures/xvnc001.yaml b/tests/wrappers/fixtures/xvnc-full.yaml
similarity index 100%
rename from tests/wrappers/fixtures/xvnc001.yaml
rename to tests/wrappers/fixtures/xvnc-full.yaml
diff --git a/tests/wrappers/fixtures/xvnc-minimal.xml b/tests/wrappers/fixtures/xvnc-minimal.xml
new file mode 100644
index 000000000..5c8d89e07
--- /dev/null
+++ b/tests/wrappers/fixtures/xvnc-minimal.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <buildWrappers>
+    <hudson.plugins.xvnc.Xvnc plugin="xvnc">
+      <takeScreenshot>false</takeScreenshot>
+      <useXauthority>true</useXauthority>
+    </hudson.plugins.xvnc.Xvnc>
+  </buildWrappers>
+</project>
diff --git a/tests/wrappers/fixtures/xvnc-minimal.yaml b/tests/wrappers/fixtures/xvnc-minimal.yaml
new file mode 100644
index 000000000..7fc304bfe
--- /dev/null
+++ b/tests/wrappers/fixtures/xvnc-minimal.yaml
@@ -0,0 +1,2 @@
+wrappers:
+  - xvnc