diff --git a/pkg/app/app_template_test.go b/pkg/app/app_template_test.go
index 8c74f744..c468c22d 100644
--- a/pkg/app/app_template_test.go
+++ b/pkg/app/app_template_test.go
@@ -646,11 +646,11 @@ func TestTemplate_DefaultInherit_Multiple(t *testing.T) {
 templates:
   ns:
     namespace: from-ns-template
-  ctx:
+  override:
     namespace: from-ctx-template
 defaultInherit:
   - ns
-  - ctx
+  - override
 releases:
 - name: app1
   chart: incubator/raw
@@ -688,7 +688,7 @@ releases:
 		})
 	}
 
-	t.Run("multiple default inherits are applied", func(t *testing.T) {
+	t.Run("multiple default inherits are applied in order", func(t *testing.T) {
 		check(t, testcase{
 			templated: []exectest.Release{
 				{Name: "app1", Flags: []string{"--kube-context", "default", "--namespace", "from-ctx-template"}},
diff --git a/pkg/state/state_exec_tmpl_test.go b/pkg/state/state_exec_tmpl_test.go
index f26fc555..92ec36df 100644
--- a/pkg/state/state_exec_tmpl_test.go
+++ b/pkg/state/state_exec_tmpl_test.go
@@ -476,10 +476,10 @@ func TestDefaultInherits_UnmarshalYAML(t *testing.T) {
 		},
 	}
 
-	for _, yamlV3 := range []bool{true, false} {
-		t.Run(fmt.Sprintf("GoYamlV3=%t", yamlV3), func(t *testing.T) {
+	for _, enableGoYamlV3 := range []bool{true, false} {
+		t.Run(fmt.Sprintf("GoYamlV3=%t", enableGoYamlV3), func(t *testing.T) {
 			prev := runtime.GoYamlV3
-			runtime.GoYamlV3 = yamlV3
+			runtime.GoYamlV3 = enableGoYamlV3
 			defer func() {
 				runtime.GoYamlV3 = prev
 			}()