diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9ac6f6a6..bebae661 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,7 +33,7 @@ feed_base_url = 'http://specs.openstack.org/openstack/heat-specs'
 feed_author = 'OpenStack Heat Team'
 
 exclude_patterns = [
-    '**/template.rst',
+    '**/templates/*.rst',
 ]
 
 # Optionally allow the use of sphinxcontrib.spelling to verify the
diff --git a/specs/juno/template.rst b/specs/templates/juno-template.rst
similarity index 100%
rename from specs/juno/template.rst
rename to specs/templates/juno-template.rst
diff --git a/specs/kilo/template.rst b/specs/templates/kilo-template.rst
similarity index 100%
rename from specs/kilo/template.rst
rename to specs/templates/kilo-template.rst
diff --git a/specs/liberty/template.rst b/specs/templates/liberty-template.rst
similarity index 100%
rename from specs/liberty/template.rst
rename to specs/templates/liberty-template.rst
diff --git a/specs/mitaka/template.rst b/specs/templates/mitaka-template.rst
similarity index 100%
rename from specs/mitaka/template.rst
rename to specs/templates/mitaka-template.rst
diff --git a/tests/test_titles.py b/tests/test_titles.py
index f235ed53..b0018a35 100644
--- a/tests/test_titles.py
+++ b/tests/test_titles.py
@@ -87,11 +87,13 @@ class TestTitles(testtools.TestCase):
 
     def test_template(self):
         releases = [x.split('/')[1] for x in glob.glob('specs/*/')]
+        # ignore directory with base templates for releases
+        releases.remove('templates')
         # Ignore juno and kilo.
         releases.remove('juno')
         releases.remove('kilo')
         for release in releases:
-            with open("specs/%s/template.rst" % release) as f:
+            with open("specs/templates/%s-template.rst" % release) as f:
                 template = f.read()
             spec = docutils.core.publish_doctree(template)
             template_titles = self._get_titles(spec)