diff --git a/pkg/state/create_test.go b/pkg/state/create_test.go
index b51f3b94..70b72f50 100644
--- a/pkg/state/create_test.go
+++ b/pkg/state/create_test.go
@@ -334,13 +334,13 @@ func TestReadFromYaml_FilterReleasesOnLabels(t *testing.T) {
 		filter  LabelFilter
 		results []bool
 	}{
-		{LabelFilter{positiveLabels: [][]string{[]string{"tier", "frontend"}}},
+		{LabelFilter{positiveLabels: [][]string{{"tier", "frontend"}}},
 			[]bool{true, true, false}},
-		{LabelFilter{positiveLabels: [][]string{[]string{"tier", "frontend"}, []string{"foo", "bar"}}},
+		{LabelFilter{positiveLabels: [][]string{{"tier", "frontend"}, {"foo", "bar"}}},
 			[]bool{true, false, false}},
-		{LabelFilter{negativeLabels: [][]string{[]string{"tier", "frontend"}}},
+		{LabelFilter{negativeLabels: [][]string{{"tier", "frontend"}}},
 			[]bool{false, false, true}},
-		{LabelFilter{positiveLabels: [][]string{[]string{"tier", "frontend"}}, negativeLabels: [][]string{[]string{"foo", "bar"}}},
+		{LabelFilter{positiveLabels: [][]string{{"tier", "frontend"}}, negativeLabels: [][]string{{"foo", "bar"}}},
 			[]bool{false, true, false}},
 	}
 	state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
@@ -375,13 +375,13 @@ func TestReadFromYaml_FilterNegatives(t *testing.T) {
 		filter  LabelFilter
 		results []bool
 	}{
-		{LabelFilter{positiveLabels: [][]string{[]string{"stage", "pre"}}},
+		{LabelFilter{positiveLabels: [][]string{{"stage", "pre"}}},
 			[]bool{true, false, false}},
-		{LabelFilter{positiveLabels: [][]string{[]string{"stage", "post"}}},
+		{LabelFilter{positiveLabels: [][]string{{"stage", "post"}}},
 			[]bool{false, true, false}},
-		{LabelFilter{negativeLabels: [][]string{[]string{"stage", "pre"}, []string{"stage", "post"}}},
+		{LabelFilter{negativeLabels: [][]string{{"stage", "pre"}, {"stage", "post"}}},
 			[]bool{false, false, true}},
-		{LabelFilter{negativeLabels: [][]string{[]string{"foo", "bar"}}},
+		{LabelFilter{negativeLabels: [][]string{{"foo", "bar"}}},
 			[]bool{false, true, true}},
 	}
 	state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
diff --git a/pkg/state/state_exec_tmpl_test.go b/pkg/state/state_exec_tmpl_test.go
index bfad30fb..57c7ed1c 100644
--- a/pkg/state/state_exec_tmpl_test.go
+++ b/pkg/state/state_exec_tmpl_test.go
@@ -90,9 +90,9 @@ func TestHelmState_executeTemplates(t *testing.T) {
 				Name:      "test-app",
 				Namespace: "dev",
 				SetValuesTemplate: []SetValue{
-					SetValue{Name: "val1", Value: "{{ .Release.Name }}-val1"},
-					SetValue{Name: "val2", File: "{{ .Release.Name }}.yml"},
-					SetValue{Name: "val3", Values: []string{"{{ .Release.Name }}-val2", "{{ .Release.Name }}-val3"}},
+					{Name: "val1", Value: "{{ .Release.Name }}-val1"},
+					{Name: "val2", File: "{{ .Release.Name }}.yml"},
+					{Name: "val3", Values: []string{"{{ .Release.Name }}-val2", "{{ .Release.Name }}-val3"}},
 				},
 			},
 			want: ReleaseSpec{
@@ -100,9 +100,9 @@ func TestHelmState_executeTemplates(t *testing.T) {
 				Name:      "test-app",
 				Namespace: "dev",
 				SetValues: []SetValue{
-					SetValue{Name: "val1", Value: "test-app-val1"},
-					SetValue{Name: "val2", File: "test-app.yml"},
-					SetValue{Name: "val3", Values: []string{"test-app-val2", "test-app-val3"}},
+					{Name: "val1", Value: "test-app-val1"},
+					{Name: "val2", File: "test-app.yml"},
+					{Name: "val3", Values: []string{"test-app-val2", "test-app-val3"}},
 				},
 			},
 		},
diff --git a/pkg/state/state_test.go b/pkg/state/state_test.go
index 090284b9..74a6213f 100644
--- a/pkg/state/state_test.go
+++ b/pkg/state/state_test.go
@@ -31,9 +31,9 @@ func TestLabelParsing(t *testing.T) {
 		expectedFilter LabelFilter
 		errorExected   bool
 	}{
-		{"foo=bar", LabelFilter{positiveLabels: [][]string{[]string{"foo", "bar"}}, negativeLabels: [][]string{}}, false},
-		{"foo!=bar", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{[]string{"foo", "bar"}}}, false},
-		{"foo!=bar,baz=bat", LabelFilter{positiveLabels: [][]string{[]string{"baz", "bat"}}, negativeLabels: [][]string{[]string{"foo", "bar"}}}, false},
+		{"foo=bar", LabelFilter{positiveLabels: [][]string{{"foo", "bar"}}, negativeLabels: [][]string{}}, false},
+		{"foo!=bar", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{{"foo", "bar"}}}, false},
+		{"foo!=bar,baz=bat", LabelFilter{positiveLabels: [][]string{{"baz", "bat"}}, negativeLabels: [][]string{{"foo", "bar"}}}, false},
 		{"foo", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{}}, true},
 		{"foo!=bar=baz", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{}}, true},
 		{"=bar", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{}}, true},