diff --git a/jenkins_jobs/modules/general.py b/jenkins_jobs/modules/general.py
index 0bfca5375..6a893afad 100644
--- a/jenkins_jobs/modules/general.py
+++ b/jenkins_jobs/modules/general.py
@@ -155,8 +155,9 @@ class General(jenkins_jobs.modules.base.Base):
         else:
             XML.SubElement(xml,
                            'blockBuildWhenUpstreamBuilding').text = 'false'
-        if 'auth-token' in data:
-            XML.SubElement(xml, 'authToken').text = data['auth-token']
+        authtoken = data.get('auth-token', None)
+        if authtoken is not None:
+            XML.SubElement(xml, 'authToken').text = authtoken
         if data.get('concurrent'):
             XML.SubElement(xml, 'concurrentBuild').text = 'true'
         else:
diff --git a/tests/general/fixtures/authtoken001.xml b/tests/general/fixtures/authtoken001.xml
new file mode 100644
index 000000000..1505db519
--- /dev/null
+++ b/tests/general/fixtures/authtoken001.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+</project>
diff --git a/tests/general/fixtures/authtoken001.yaml b/tests/general/fixtures/authtoken001.yaml
new file mode 100644
index 000000000..f045a1246
--- /dev/null
+++ b/tests/general/fixtures/authtoken001.yaml
@@ -0,0 +1,2 @@
+project-type: freestyle
+auth-token:
diff --git a/tests/general/fixtures/authtoken002.xml b/tests/general/fixtures/authtoken002.xml
new file mode 100644
index 000000000..f8c4db90a
--- /dev/null
+++ b/tests/general/fixtures/authtoken002.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <authToken>testvalue</authToken>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+</project>
diff --git a/tests/general/fixtures/authtoken002.yaml b/tests/general/fixtures/authtoken002.yaml
new file mode 100644
index 000000000..aeff36bb5
--- /dev/null
+++ b/tests/general/fixtures/authtoken002.yaml
@@ -0,0 +1,2 @@
+project-type: freestyle
+auth-token: 'testvalue'
diff --git a/tests/general/fixtures/authtoken003.xml b/tests/general/fixtures/authtoken003.xml
new file mode 100644
index 000000000..ea1b50e6e
--- /dev/null
+++ b/tests/general/fixtures/authtoken003.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <actions/>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <authToken/>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+</project>
diff --git a/tests/general/fixtures/authtoken003.yaml b/tests/general/fixtures/authtoken003.yaml
new file mode 100644
index 000000000..f45d39c4f
--- /dev/null
+++ b/tests/general/fixtures/authtoken003.yaml
@@ -0,0 +1,2 @@
+project-type: freestyle
+auth-token: ''