diff --git a/pkg/chartutil/chartfile_test.go b/pkg/chartutil/chartfile_test.go
index 30bb0c69b..f17a86701 100755
--- a/pkg/chartutil/chartfile_test.go
+++ b/pkg/chartutil/chartfile_test.go
@@ -88,6 +88,18 @@ func verifyChartfile(t *testing.T, f *chart.Metadata, name string) {
 		t.Error("Unexpected keywords")
 	}
 
+	if len(f.Annotations) != 2 {
+		t.Fatalf("Unexpected annotations")
+	}
+
+	if value := f.Annotations["extrakey"]; value != "extravalue" {
+		t.Errorf("Expected extravalue, but got %s", value)
+	}
+
+	if value := f.Annotations["anotherkey"]; value != "anothervalue" {
+		t.Errorf("Expected anotherkey, but got %s", value)
+	}
+
 	kk := []string{"frobnitz", "sprocket", "dodad"}
 	for i, k := range f.Keywords {
 		if kk[i] != k {
diff --git a/pkg/chartutil/testdata/chartfiletest.yaml b/pkg/chartutil/testdata/chartfiletest.yaml
index 7c071c27b..134cd1109 100644
--- a/pkg/chartutil/testdata/chartfiletest.yaml
+++ b/pkg/chartutil/testdata/chartfiletest.yaml
@@ -15,3 +15,6 @@ sources:
   - https://example.com/foo/bar
 home: http://example.com
 icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
diff --git a/pkg/chartutil/testdata/frobnitz-1.2.3.tgz b/pkg/chartutil/testdata/frobnitz-1.2.3.tgz
index aaf443dba..fb21cd08f 100644
Binary files a/pkg/chartutil/testdata/frobnitz-1.2.3.tgz and b/pkg/chartutil/testdata/frobnitz-1.2.3.tgz differ
diff --git a/pkg/chartutil/testdata/frobnitz/Chart.yaml b/pkg/chartutil/testdata/frobnitz/Chart.yaml
index 7c071c27b..134cd1109 100644
--- a/pkg/chartutil/testdata/frobnitz/Chart.yaml
+++ b/pkg/chartutil/testdata/frobnitz/Chart.yaml
@@ -15,3 +15,6 @@ sources:
   - https://example.com/foo/bar
 home: http://example.com
 icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
diff --git a/pkg/chartutil/testdata/frobnitz_backslash-1.2.3.tgz b/pkg/chartutil/testdata/frobnitz_backslash-1.2.3.tgz
old mode 100755
new mode 100644
index dbd48feb0..692dd6aba
Binary files a/pkg/chartutil/testdata/frobnitz_backslash-1.2.3.tgz and b/pkg/chartutil/testdata/frobnitz_backslash-1.2.3.tgz differ
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml b/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml
index 8b3e295c7..49df2a046 100755
--- a/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml
+++ b/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml
@@ -15,3 +15,6 @@ sources:
   - https://example.com/foo/bar
 home: http://example.com
 icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue