diff --git a/cmd/helm/template_test.go b/cmd/helm/template_test.go
index 8fb8292e2..508dcf88a 100644
--- a/cmd/helm/template_test.go
+++ b/cmd/helm/template_test.go
@@ -131,6 +131,11 @@ func TestTemplateCmd(t *testing.T) {
 			cmd:    fmt.Sprintf(`template '%s' --skip-tests`, chartPath),
 			golden: "output/template-skip-tests.txt",
 		},
+		{
+			name:   "template chart-with-alt-delim",
+			cmd:    "template alt-delim testdata/testcharts/chart-with-alt-delim",
+			golden: "output/template-chart-with-alt-delim.txt",
+		},
 	}
 	runTestCmd(t, tests)
 }
diff --git a/cmd/helm/testdata/output/install-chart-with-alt-delim.txt b/cmd/helm/testdata/output/install-chart-with-alt-delim.txt
index d3d1b6acf..d51348140 100644
--- a/cmd/helm/testdata/output/install-chart-with-alt-delim.txt
+++ b/cmd/helm/testdata/output/install-chart-with-alt-delim.txt
@@ -1,17 +1,6 @@
----
-# Source: chart-with-alt-delim/templates/alt-configmap.yaml
-# helm: delim=[,]
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: alt-delim-chart-with-alt-delim-alt
-data:
-  myvalue: "Hello {{world}}"
----
-# Source: chart-with-alt-delim/templates/normal-configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: alt-delim-chart-with-alt-delim-normal
-data:
-  myvalue: "Hello world"
+NAME: alt-delim
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 1
+TEST SUITE: None
diff --git a/cmd/helm/testdata/output/template-chart-with-alt-delim.txt b/cmd/helm/testdata/output/template-chart-with-alt-delim.txt
new file mode 100644
index 000000000..d3d1b6acf
--- /dev/null
+++ b/cmd/helm/testdata/output/template-chart-with-alt-delim.txt
@@ -0,0 +1,17 @@
+---
+# Source: chart-with-alt-delim/templates/alt-configmap.yaml
+# helm: delim=[,]
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: alt-delim-chart-with-alt-delim-alt
+data:
+  myvalue: "Hello {{world}}"
+---
+# Source: chart-with-alt-delim/templates/normal-configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: alt-delim-chart-with-alt-delim-normal
+data:
+  myvalue: "Hello world"