diff --git a/data/templates/default.jats b/data/templates/default.jats
index 228a0636a..966da5c29 100644
--- a/data/templates/default.jats
+++ b/data/templates/default.jats
@@ -83,14 +83,14 @@ $for(author)$
 $if(author.orcid)$
 <contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
 $endif$
-<name>
 $if(author.surname)$
+<name>
 <surname>$author.surname$</surname>
 <given-names>$author.given-names$</given-names>
+</name>
 $else$
 <string-name>$author$</string-name>
 $endif$
-</name>
 $if(author.email)$
 <email>$author.email$</email>
 $endif$
diff --git a/test/writer.jats b/test/writer.jats
index 8ca27083a..ae24f3e50 100644
--- a/test/writer.jats
+++ b/test/writer.jats
@@ -16,14 +16,10 @@
 </title-group>
 <contrib-group>
 <contrib contrib-type="author">
-<name>
 <string-name>John MacFarlane</string-name>
-</name>
 </contrib>
 <contrib contrib-type="author">
-<name>
 <string-name>Anonymous</string-name>
-</name>
 </contrib>
 </contrib-group>
 <pub-date pub-type="epub">