diff --git a/pkg/chart/v2/util/dependencies_test.go b/pkg/chart/v2/util/dependencies_test.go
index d9b5c31e4..0895887eb 100644
--- a/pkg/chart/v2/util/dependencies_test.go
+++ b/pkg/chart/v2/util/dependencies_test.go
@@ -586,46 +586,6 @@ func TestChartWithDependencyAliasedTwiceAndDoublyReferencedSubDependency(t *test
 	validateDependencyTree(t, c)
 }
 
-func TestDependencyWithSameNameDifferentVersion(t *testing.T) {
-	type M = map[string]interface{}
-	tests := []struct {
-		name     string
-		v        M
-		charts   []string // expected dependent charts names
-		versions []string // expected dependent charts versions
-	}{
-		{
-			"same name subcharts enbale one",
-			M{"one": M{"enabled": true}, "two": M{"enabled": false}},
-			[]string{"parent-chart.test"},
-			[]string{"0.1.0"},
-		},
-		{
-			"same name subcharts enbale another one",
-			M{"one": M{"enabled": false}, "two": M{"enabled": true}},
-			[]string{"parent-chart.test"},
-			[]string{"0.2.0"},
-		},
-	}
-
-	for _, tc := range tests {
-		c := loadChart(t, "testdata/dependent-chart-with-same-name-different-version")
-		t.Run(tc.name, func(t *testing.T) {
-			if err := processDependencyEnabled(c, tc.v, ""); err != nil {
-				t.Fatalf("error processing enabled dependencies %v", err)
-			}
-			if len(c.Dependencies()) != len(tc.charts) {
-				t.Fatalf("slice lengths do not match got %v, expected %v", len(c.Dependencies()), len(tc.charts))
-			}
-			for i, d := range c.Dependencies() {
-				if d.Metadata.Version != tc.versions[i] {
-					t.Fatalf("slice values do not match got %v, expected %v", tc.versions[i], d.Metadata.Version)
-				}
-			}
-		})
-	}
-}
-
 func TestDependencyWithDifferentAliasNameSameVersion(t *testing.T) {
 	type M = map[string]interface{}
 	tests := []struct {
diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/Chart.lock b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/Chart.lock
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/Chart.lock
rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/Chart.lock
diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/charts/test-0.1.0.tgz b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/charts/test-0.1.0.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/charts/test-0.1.0.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/charts/test-0.1.0.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/templates/autoscaler.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/templates/autoscaler.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/templates/autoscaler.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/templates/autoscaler.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.lock b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.lock
deleted file mode 100644
index b2f17fb39..000000000
--- a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: dev
-  repository: file://envs/dev
-  version: v0.1.0
-- name: prod
-  repository: file://envs/prod
-  version: v0.1.0
-digest: sha256:9403fc24f6cf9d6055820126cf7633b4bd1fed3c77e4880c674059f536346182
-generated: "2020-02-03T10:38:51.180474+01:00"
diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.yaml b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.yaml
deleted file mode 100644
index 1db9388db..000000000
--- a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v2
-name: parent-chart
-version: 0.1.0
-appVersion: v0.1.0
-dependencies:
-  - name: test
-    version: "0.1.0"
-    condition: one.enabled
-
-  - name: test
-    version: "0.2.0"
-    condition: two.enabled
\ No newline at end of file
diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.1.0.tgz b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.1.0.tgz
deleted file mode 100644
index 33390b31b..000000000
Binary files a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.1.0.tgz and /dev/null differ
diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.2.0.tgz b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.2.0.tgz
deleted file mode 100644
index 347032915..000000000
Binary files a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.2.0.tgz and /dev/null differ
diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/templates/autoscaler.yaml b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/templates/autoscaler.yaml
deleted file mode 100644
index 976e5a8f1..000000000
--- a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/templates/autoscaler.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-###################################################################################################
-# parent-chart horizontal pod autoscaler
-###################################################################################################
-apiVersion: autoscaling/v1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ .Release.Name }}-autoscaler
-  namespace: {{ .Release.Namespace }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1beta1
-    kind: Deployment
-    name: {{ .Release.Name }}
-  minReplicas: {{ required "A valid .Values.resources.autoscaler.minReplicas entry required!" .Values.resources.autoscaler.minReplicas }}
-  maxReplicas: {{ required "A valid .Values.resources.autoscaler.maxReplicas entry required!" .Values.resources.autoscaler.maxReplicas }}
-  targetCPUUtilizationPercentage: {{ required "A valid .Values.resources.autoscaler.targetCPUUtilizationPercentage!" .Values.resources.autoscaler.targetCPUUtilizationPercentage }}
\ No newline at end of file
diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/values.yaml b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/values.yaml
deleted file mode 100644
index 3424c6547..000000000
--- a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/values.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default values for parent-chart.
-nameOverride: parent-chart
-one:
-  enabled: false
-two:
-  enabled: true
-resources:
-  autoscaler:
-    minReplicas: 0
-    maxReplicas: 0
-    targetCPUUtilizationPercentage: 99
\ No newline at end of file