diff --git a/features/puppet.feature b/features/puppet.feature
index 25d3fc4..20e8cd1 100644
--- a/features/puppet.feature
+++ b/features/puppet.feature
@@ -22,3 +22,8 @@ Scenario: Run puppet manifest with static files being served by fileserver
   Given I have a clean running node n1
   When I run puppet manifest "test_fileserver.pp" with config file "puppet_fileserver.conf" on node "n1"
   Then Node "n1" should have file or directory "/tmp/puppet_test_fileserver"
+
+Scenario: Run puppet manifest with template dir configuration
+  Given I have a clean running node n1
+  When I run puppet manifest "test_template.pp" with config file "puppet_template.conf" on node "n1"
+  Then Node "n1" should have file or directory "/tmp/puppet_test_template"
diff --git a/fixtures/puppet/conf/puppet_template.conf b/fixtures/puppet/conf/puppet_template.conf
new file mode 100644
index 0000000..701c224
--- /dev/null
+++ b/fixtures/puppet/conf/puppet_template.conf
@@ -0,0 +1,8 @@
+[main]
+	templatedir = /tmp/toft-puppet-tmp/manifests/templates
+	
+  logdir = /var/log/puppet
+  vardir = /var/lib/puppet
+  ssldir = /var/lib/puppet/ssl
+  rundir = /var/run/puppet
+  report = true
diff --git a/fixtures/puppet/manifests/templates/template_test b/fixtures/puppet/manifests/templates/template_test
new file mode 100644
index 0000000..b2b40ea
--- /dev/null
+++ b/fixtures/puppet/manifests/templates/template_test
@@ -0,0 +1,2 @@
+This is a test for the template config
+Here is the variable <%= variable %>
diff --git a/fixtures/puppet/manifests/test_template.pp b/fixtures/puppet/manifests/test_template.pp
new file mode 100644
index 0000000..7b377f4
--- /dev/null
+++ b/fixtures/puppet/manifests/test_template.pp
@@ -0,0 +1,12 @@
+class { 'test': }
+
+class test {
+  
+  $variable = "BLAH"
+
+  file { "/tmp/puppet_test_template":
+	  ensure => present,
+    mode  => '0666',
+    content => template(template_test)
+  }
+}