diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go
index f9704c335..6dce92d60 100644
--- a/pipeline/brew/brew.go
+++ b/pipeline/brew/brew.go
@@ -26,9 +26,12 @@ const formulae = `class {{ .Name }} < Formula
     bin.install "{{ .BinaryName }}"
   end
 
-  {{ if .Caveats }}def caveats
+  {{- if .Caveats }}
+
+  def caveats
     "{{ .Caveats }}"
-  end{{ end }}
+  end
+  {{- end }}
 end
 `
 
diff --git a/pipeline/brew/brew_test.go b/pipeline/brew/brew_test.go
index 920b8462d..310cfa046 100644
--- a/pipeline/brew/brew_test.go
+++ b/pipeline/brew/brew_test.go
@@ -18,35 +18,42 @@ func TestSimpleName(t *testing.T) {
 	assert.Equal(t, formulaNameFor("binary"), "Binary")
 }
 
-var testFormulaeExpected = `class Test < Formula
-  desc "Some desc"
-  homepage "https://google.com"
-  url "https://github.com/caarlos0/test/releases/download/v0.1.3/test_#{%x(uname -s).gsub(/\n/, '')}_#{%x(uname -m).gsub(/\n/, '')}.tar.gz"
-  head "https://github.com/caarlos0/test.git"
-  version "v0.1.3"
-
-  def install
-    bin.install "test"
-  end
-
-  def caveats
-    "Here are some caveats"
-  end
-end
-`
-
-func TestFormulae(t *testing.T) {
-	assert := assert.New(t)
-	out, err := doBuildFormulae(templateData{
-		BinaryName: "test",
-		Desc:       "Some desc",
-		Homepage:   "https://google.com",
-		Name:       "Test",
-		Repo:       "caarlos0/test",
-		Tag:        "v0.1.3",
-		Caveats:    "Here are some caveats",
-	})
-	assert.NoError(err)
-	assert.NoError(err)
-	assert.Equal(testFormulaeExpected, out.String())
+var defaultTemplateData = templateData{
+	BinaryName: "test",
+	Desc:       "Some desc",
+	Homepage:   "https://google.com",
+	Name:       "Test",
+	Repo:       "caarlos0/test",
+	Tag:        "v0.1.3",
+}
+
+func assertDefaultTemplateData(t *testing.T, formulae string) {
+	assert := assert.New(t)
+	assert.Contains(formulae, "class Test < Formula")
+	assert.Contains(formulae, "homepage \"https://google.com\"")
+	assert.Contains(formulae, "url \"https://github.com/caarlos0/test/releases/download/v0.1.3/test_#{%x(uname -s).gsub(/\\n/, '')}_#{%x(uname -m).gsub(/\\n/, '')}.tar.gz\"")
+	assert.Contains(formulae, "head \"https://github.com/caarlos0/test.git\"")
+	assert.Contains(formulae, "version \"v0.1.3\"")
+	assert.Contains(formulae, "bin.install \"test\"")
+}
+
+func TestFullFormulae(t *testing.T) {
+	assert := assert.New(t)
+	data := defaultTemplateData
+	data.Caveats = "Here are some caveats"
+	out, err := doBuildFormulae(data)
+	assert.NoError(err)
+	formulae := out.String()
+	assertDefaultTemplateData(t, formulae)
+	assert.Contains(formulae, "def caveats")
+	assert.Contains(formulae, "Here are some caveats")
+}
+
+func TestFormulaeNoCaveats(t *testing.T) {
+	assert := assert.New(t)
+	out, err := doBuildFormulae(defaultTemplateData)
+	assert.NoError(err)
+	formulae := out.String()
+	assertDefaultTemplateData(t, formulae)
+	assert.NotContains(formulae, "def caveats")
 }