diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom.tgz b/pkg/chart/loader/testdata/frobnitz_with_bom.tgz
index be0cd027d..d24775b1b 100644
Binary files a/pkg/chart/loader/testdata/frobnitz_with_bom.tgz and b/pkg/chart/loader/testdata/frobnitz_with_bom.tgz differ
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/values/value.yaml b/pkg/chart/loader/testdata/frobnitz_with_bom/values/value.yaml
new file mode 100644
index 000000000..6c32007ff
--- /dev/null
+++ b/pkg/chart/loader/testdata/frobnitz_with_bom/values/value.yaml
@@ -0,0 +1 @@
+name: "{{ .Values.name }} Too"
diff --git a/pkg/chartutil/testdata/mariner/values/placeholder.yaml b/pkg/chartutil/testdata/frobnitz/charts/mariner/values/placeholder.yaml
similarity index 100%
rename from pkg/chartutil/testdata/mariner/values/placeholder.yaml
rename to pkg/chartutil/testdata/frobnitz/charts/mariner/values/placeholder.yaml
diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 29ed67026..ab4770bf2 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -42,7 +42,7 @@ func TestBadChart(t *testing.T) {
 		t.Errorf("Number of errors %v", len(m))
 		t.Errorf("All didn't fail with expected errors, got %#v", m)
 	}
-	// There should be one INFO, 2 WARNINGs and 2 ERROR messages, check for them
+	// There should be one INFO, 2 WARNINGs and one ERROR messages, check for them
 	var i, w, e, e2, e3, e4, e5, e6 bool
 	for _, msg := range m {
 		if msg.Severity == support.InfoSev {
@@ -74,13 +74,13 @@ func TestBadChart(t *testing.T) {
 			if strings.Contains(msg.Err.Error(), "dependencies are not valid in the Chart file with apiVersion") {
 				e5 = true
 			}
-			// This comes from the dependency check, which loads dependency info from the Chart.yaml
-			if strings.Contains(msg.Err.Error(), "unable to load chart") {
+
+			if strings.Contains(msg.Err.Error(), "chart.metadata.name is required") {
 				e6 = true
 			}
 		}
 	}
-	if !e || !e2 || !e3 || !e4 || !e5 || !w || !i || !e6 {
+	if !e || !e2 || !e3 || !e4 || !e5 || !e6 || !w || !i {
 		t.Errorf("Didn't find all the expected errors, got %#v", m)
 	}
 }