diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go
index 01065d51..33301d01 100644
--- a/pkg/app/app_test.go
+++ b/pkg/app/app_test.go
@@ -1442,7 +1442,7 @@ func TestLoadDesiredStateFromYaml_DuplicateReleaseName(t *testing.T) {
 }
 
 func TestLoadDesiredStateFromYaml_Bases(t *testing.T) {
-	yamlFile := "/path/to/yaml/file"
+	yamlFile := "/path/to/yaml/file.gotmpl"
 	yamlContent := `bases:
 - ../base.yaml
 - ../base.gotmpl
@@ -1513,7 +1513,7 @@ helmDefaults:
 }
 
 func TestLoadDesiredStateFromYaml_MultiPartTemplate(t *testing.T) {
-	yamlFile := "/path/to/yaml/file"
+	yamlFile := "/path/to/yaml/file.gotmpl"
 	yamlContent := `bases:
 - ../base.yaml
 ---
diff --git a/pkg/policy/checker_test.go b/pkg/policy/checker_test.go
index e7e41811..263e4ae7 100644
--- a/pkg/policy/checker_test.go
+++ b/pkg/policy/checker_test.go
@@ -138,26 +138,31 @@ func TestTopConfigKeysVerifier(t *testing.T) {
 			name:            "error when not correct order 00",
 			helmfileContent: []byte("releases:\nbases:\n"),
 			wantErr:         true,
+			wantStrict:      true,
 		},
 		{
 			name:            "error when not correct order 01",
 			helmfileContent: []byte("releases:\nhelmDefaults:\nbases:\n"),
 			wantErr:         true,
+			wantStrict:      true,
 		},
 		{
 			name:            "error when not correct order 02",
 			helmfileContent: []byte("helmDefaults:\nreleases:\nbases:\n"),
 			wantErr:         true,
+			wantStrict:      true,
 		},
 		{
 			name:            "error when not correct order 03",
 			helmfileContent: []byte("releases:\nva:\nve:\nbases:\n"),
 			wantErr:         true,
+			wantStrict:      true,
 		},
 		{
 			name:            "error when not correct order 04",
 			helmfileContent: []byte("bases:\nreleases:\nenvironments:\n"),
 			wantErr:         true,
+			wantStrict:      true,
 		},
 		{
 			name:            "no error when only has bases",
diff --git a/test/e2e/template/helmfile/testdata/snapshot/issue_2098_release_template_needs/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/issue_2098_release_template_needs/output.yaml
index 9e3dec93..fb2d2b51 100644
--- a/test/e2e/template/helmfile/testdata/snapshot/issue_2098_release_template_needs/output.yaml
+++ b/test/e2e/template/helmfile/testdata/snapshot/issue_2098_release_template_needs/output.yaml
@@ -1,7 +1,7 @@
 ---
-#  Source: __workingdir__/testdata/snapshot/issue_2098_release_template_needs/input.yaml
+#  Source: __workingdir__/testdata/snapshot/issue_2098_release_template_needs/input.yaml.gotmpl
 
-filepath: input.yaml
+filepath: input.yaml.gotmpl
 helmBinary: helm
 kustomizeBinary: kustomize
 environments: