diff --git a/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1/Chart.yaml b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1/Chart.yaml
new file mode 100644
index 000000000..3b342ae4f
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+name: multiplecharts-lint-chart-1
+version: 1
+icon: ""
\ No newline at end of file
diff --git a/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1/templates/configmap.yaml b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1/templates/configmap.yaml
new file mode 100644
index 000000000..88ebf2468
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1/templates/configmap.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+metadata:
+    name: multicharttest-chart1-configmap
+data:
+    dat: |
+    {{ .Values.config | indent 4 }}
diff --git a/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1/values.yaml b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1/values.yaml
new file mode 100644
index 000000000..aafb09e4b
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1/values.yaml
@@ -0,0 +1 @@
+config: "Test"
\ No newline at end of file
diff --git a/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2/Chart.yaml b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2/Chart.yaml
new file mode 100644
index 000000000..bd101d808
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+name: multiplecharts-lint-chart-2
+version: 1
+icon: ""
\ No newline at end of file
diff --git a/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2/templates/configmap.yaml b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2/templates/configmap.yaml
new file mode 100644
index 000000000..8484bfe6a
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2/templates/configmap.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+metadata:
+    name: multicharttest-chart2-configmap
+data:
+    {{ toYaml .Values.config | indent 4 }}
diff --git a/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2/values.yaml b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2/values.yaml
new file mode 100644
index 000000000..9139f486e
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2/values.yaml
@@ -0,0 +1,2 @@
+config:
+    test: "Test"
\ No newline at end of file
diff --git a/pkg/action/lint_test.go b/pkg/action/lint_test.go
index eec9f9533..45af0df95 100644
--- a/pkg/action/lint_test.go
+++ b/pkg/action/lint_test.go
@@ -31,6 +31,8 @@ var (
 	chartMissingManifest         = "../../cmd/helm/testdata/testcharts/chart-missing-manifest"
 	chartSchema                  = "../../cmd/helm/testdata/testcharts/chart-with-schema"
 	chartSchemaNegative          = "../../cmd/helm/testdata/testcharts/chart-with-schema-negative"
+	chart1MultipleChartLint      = "../../cmd/helm/testdata/testcharts/multiplecharts-lint-chart-1"
+	chart2MultipleChartLint      = "../../cmd/helm/testdata/testcharts/multiplecharts-lint-chart-2"
 )
 
 func TestLintChart(t *testing.T) {
@@ -56,3 +58,12 @@ func TestLintChart(t *testing.T) {
 		t.Error(err)
 	}
 }
+
+func TestLint_MultipleCharts(t *testing.T) {
+	testCharts := []string{chart2MultipleChartLint, chart1MultipleChartLint}
+	testLint := NewLint()
+	if result := testLint.Run(testCharts, values); len(result.Errors) == 0 {
+		t.Error(result.Errors)
+	}
+
+}