diff --git a/tpl/template_test.go b/tpl/template_test.go
index 159d6cf53..9a726f3fa 100644
--- a/tpl/template_test.go
+++ b/tpl/template_test.go
@@ -9,6 +9,9 @@ import (
 	"testing"
 )
 
+type tstNoStringer struct {
+}
+
 func TestGt(t *testing.T) {
 	for i, this := range []struct {
 		left          interface{}
@@ -828,6 +831,27 @@ func TestMarkdownify(t *testing.T) {
 	}
 }
 
+func TestChomp(t *testing.T) {
+	base := "\n This is\na story "
+	for i, item := range []string{
+		"\n",
+		"\r",
+		"\r\n",
+	} {
+		chomped, _ := Chomp(base + item)
+
+		if chomped != base {
+			t.Errorf("[%d] Chomp failed, got '%v'", i, chomped)
+		}
+
+		_, err := Chomp(tstNoStringer{})
+
+		if err == nil {
+			t.Errorf("Chomp should fail")
+		}
+	}
+}
+
 func TestSafeHtml(t *testing.T) {
 	for i, this := range []struct {
 		str                 string