diff --git a/data/templates b/data/templates
index 06fe6706f..de2e524e7 160000
--- a/data/templates
+++ b/data/templates
@@ -1 +1 @@
-Subproject commit 06fe6706f1b0655185248cc0c1ee3d2e187ec07d
+Subproject commit de2e524e7df0a9d4159f2794deaa2e1847c87d46
diff --git a/tests/s5-basic.html b/tests/s5-basic.html
index ac153d0f1..6fb57e4aa 100644
--- a/tests/s5-basic.html
+++ b/tests/s5-basic.html
@@ -4,7 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <meta name="generator" content="pandoc" />
+  <meta name="version" content="S5 1.1" />
   <meta name="author" content="Sam Smith" />
+  <meta name="version" content="S5 1.1" />
   <meta name="author" content="Jen Jones" />
   <meta name="date" content="2006-07-15" />
   <title>My S5 Document</title>
@@ -32,9 +34,9 @@
 </div>
 <div class="presentation">
 <div class="titleslide slide">
-  <h1>My S5 Document</h1>
-  <h2>Sam Smith<br/>Jen Jones</h2>
-  <h3>July 15, 2006</h3>
+  <h1 class="title">My S5 Document</h1>
+  <h3 class="author">Sam Smith<br/>Jen Jones</h3>
+  <h4 class="date">July 15, 2006</h4>
 </div>
 <div id="first-slide" class="slide section level1">
 <h1>First slide</h1>
diff --git a/tests/s5-fancy.html b/tests/s5-fancy.html
index 818cca04a..3a2a602be 100644
--- a/tests/s5-fancy.html
+++ b/tests/s5-fancy.html
@@ -4,7 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <meta name="generator" content="pandoc" />
+  <meta name="version" content="S5 1.1" />
   <meta name="author" content="Sam Smith" />
+  <meta name="version" content="S5 1.1" />
   <meta name="author" content="Jen Jones" />
   <meta name="date" content="2006-07-15" />
   <title>My S5 Document</title>
@@ -233,9 +235,9 @@
 </div>
 <div class="presentation">
 <div class="titleslide slide">
-  <h1>My S5 Document</h1>
-  <h2>Sam Smith<br/>Jen Jones</h2>
-  <h3>July 15, 2006</h3>
+  <h1 class="title">My S5 Document</h1>
+  <h3 class="author">Sam Smith<br/>Jen Jones</h3>
+  <h4 class="date">July 15, 2006</h4>
 </div>
 <div id="first-slide" class="slide section level1">
 <h1>First slide</h1>
diff --git a/tests/writer.asciidoc b/tests/writer.asciidoc
index aebc529f0..83869df39 100644
--- a/tests/writer.asciidoc
+++ b/tests/writer.asciidoc
@@ -1,8 +1,7 @@
 Pandoc Test Suite
 =================
-:author: John MacFarlane
-:author: Anonymous
-:date: July 17, 2006
+John MacFarlane; Anonymous
+July 17, 2006
 
 This is a set of tests for pandoc. Most of them are adapted from John Gruber’s
 markdown test suite.