diff --git a/src/spec/doc/index.adoc b/src/spec/doc/index.adoc
index 0d03f7c..736618d 100644
--- a/src/spec/doc/index.adoc
+++ b/src/spec/doc/index.adoc
@@ -57,7 +57,7 @@
 
 Groovy integrates very well with http://ant.apache.org[Apache Ant] thanks to <<_antbuilder,AntBuilder>>.
 
-include::{projectdir}/src/spec/doc/template-engines.adoc[leveloffset=+2]
+include::{projectdir}/subprojects/groovy-templates/{specfolder}/template-engines.adoc[leveloffset=+2]
 
 include::{projectdir}/subprojects/groovy-servlet/{specfolder}/servlet-userguide.adoc[leveloffset=+2]
 
diff --git a/subprojects/groovy-templates/build.gradle b/subprojects/groovy-templates/build.gradle
index 3e80c69..a821a27 100644
--- a/subprojects/groovy-templates/build.gradle
+++ b/subprojects/groovy-templates/build.gradle
@@ -1,6 +1,7 @@
 dependencies {
     compile rootProject
     compile project(':groovy-xml')
+    testCompile rootProject.sourceSets.test.runtimeClasspath
     testCompile project(':groovy-test')
     testCompile("org.spockframework:spock-core:0.7-groovy-2.0") {
         exclude module: 'groovy-all'
diff --git a/src/spec/doc/template-engines.adoc b/subprojects/groovy-templates/src/spec/doc/template-engines.adoc
similarity index 75%
rename from src/spec/doc/template-engines.adoc
rename to subprojects/groovy-templates/src/spec/doc/template-engines.adoc
index 4a0a62b..0caffbf 100644
--- a/src/spec/doc/template-engines.adoc
+++ b/subprojects/groovy-templates/src/spec/doc/template-engines.adoc
@@ -21,35 +21,35 @@
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine1,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine1,indent=0]
 ----
 
 While it is generally not deemed good practice to mix processing logic in your template (or view), sometimes very simple logic can be useful. E.g. in the example above, we could change this:
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine2,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine2,indent=0]
 ----
 
 to this (assuming we have set up a static import for capitalize **inside** the template):
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine3,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine3,indent=0]
 ----
 
 or this:
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine4,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine4,indent=0]
 ----
 
 to this:
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine5,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine5,indent=0]
 ----
 
 === Advanced Usage Note
@@ -58,28 +58,28 @@
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine6,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine6,indent=0]
 ----
 
 Similarly, if we wanted a newline, we would use:
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine7,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine7,indent=0]
 ----
 
 in any GString expression or scriptlet $$'code'$$ that appears inside a Groovy script. A normal "`\n`" is fine within the static template text itself or if the entire template itself is in an external template file. Similarly, to represent an actual backslash in your text you would need
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine8,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine8,indent=0]
 ----
 
 in an external file or
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine8,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=simple_template_engine8,indent=0]
 ----
 
 in any GString expression or scriptlet $$'code'$$. (Note: the necessity to have this extra slash may go away in a future version of Groovy if we can find an easy way to support such a change.)
@@ -91,14 +91,14 @@
 [source,groovy]
 .test.template
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=gstring_template_engine1,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=gstring_template_engine1,indent=0]
 ----
 
 Note that we used `out` instead of `print` to support the streaming nature of `GStringTemplateEngine`. Because we have the template in a separate file, there is no need to escape the backslashes. Here is how we call it:
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=gstring_template_engine2,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=gstring_template_engine2,indent=0]
 ----
 
 and here is the output:
@@ -122,7 +122,7 @@
 
 [source,groovy]
 ----
-include::{projectdir}/src/spec/test/TemplateEnginesTest.groovy[tags=xml_template_engine,indent=0]
+include::{rootProjectDir}/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy[tags=xml_template_engine,indent=0]
 ----
 
 This example will produce this output:
diff --git a/src/spec/test/TemplateEnginesTest.groovy b/subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy
similarity index 100%
rename from src/spec/test/TemplateEnginesTest.groovy
rename to subprojects/groovy-templates/src/spec/test/TemplateEnginesTest.groovy