diff --git a/pkg/chartutil/coalesce_test.go b/pkg/chartutil/coalesce_test.go
index 2a3d848fa..5a4656d71 100644
--- a/pkg/chartutil/coalesce_test.go
+++ b/pkg/chartutil/coalesce_test.go
@@ -21,6 +21,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
+	"helm.sh/helm/v3/pkg/chart"
 )
 
 // ref: http://www.yaml.org/spec/1.2/spec.html#id2803362
@@ -55,9 +57,48 @@ pequod:
       bar: null
 `)
 
+func withDeps(c *chart.Chart, deps ...*chart.Chart) *chart.Chart {
+	c.AddDependency(deps...)
+	return c
+}
+
 func TestCoalesceValues(t *testing.T) {
 	is := assert.New(t)
-	c := loadChart(t, "testdata/moby")
+
+	c := withDeps(&chart.Chart{
+		Metadata: &chart.Metadata{Name: "moby"},
+		Values: map[string]interface{}{
+			"back":     "exists",
+			"bottom":   "exists",
+			"front":    "exists",
+			"left":     "exists",
+			"name":     "moby",
+			"nested":   map[string]interface{}{"boat": true},
+			"override": "bad",
+			"right":    "exists",
+			"scope":    "moby",
+			"top":      "nope",
+		},
+	},
+		withDeps(&chart.Chart{
+			Metadata: &chart.Metadata{Name: "pequod"},
+			Values:   map[string]interface{}{"name": "pequod", "scope": "pequod"},
+		},
+			&chart.Chart{
+				Metadata: &chart.Metadata{Name: "ahab"},
+				Values: map[string]interface{}{
+					"scope":  "ahab",
+					"name":   "ahab",
+					"boat":   true,
+					"nested": map[string]interface{}{"foo": false, "bar": true},
+				},
+			},
+		),
+		&chart.Chart{
+			Metadata: &chart.Metadata{Name: "spouter"},
+			Values:   map[string]interface{}{"scope": "spouter"},
+		},
+	)
 
 	vals, err := ReadValues(testCoalesceValuesYaml)
 	if err != nil {
diff --git a/pkg/chartutil/create_test.go b/pkg/chartutil/create_test.go
index d2a3b0a20..a11c45140 100644
--- a/pkg/chartutil/create_test.go
+++ b/pkg/chartutil/create_test.go
@@ -81,7 +81,7 @@ func TestCreateFrom(t *testing.T) {
 		Name:       "foo",
 		Version:    "0.1.0",
 	}
-	srcdir := "./testdata/mariner"
+	srcdir := "./testdata/frobnitz/charts/mariner"
 
 	if err := CreateFrom(cf, tdir, srcdir); err != nil {
 		t.Fatal(err)
diff --git a/pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz b/pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz
deleted file mode 100644
index 5648f6f6d..000000000
Binary files a/pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz and /dev/null differ
diff --git a/pkg/chartutil/testdata/mariner/Chart.yaml b/pkg/chartutil/testdata/frobnitz/charts/mariner/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/mariner/Chart.yaml
rename to pkg/chartutil/testdata/frobnitz/charts/mariner/Chart.yaml
diff --git a/pkg/chartutil/testdata/albatross/Chart.yaml b/pkg/chartutil/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/albatross/Chart.yaml
rename to pkg/chartutil/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
diff --git a/pkg/chartutil/testdata/albatross/values.yaml b/pkg/chartutil/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/albatross/values.yaml
rename to pkg/chartutil/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
diff --git a/pkg/chartutil/testdata/mariner/templates/placeholder.tpl b/pkg/chartutil/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
similarity index 100%
rename from pkg/chartutil/testdata/mariner/templates/placeholder.tpl
rename to pkg/chartutil/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
diff --git a/pkg/chartutil/testdata/mariner/values.yaml b/pkg/chartutil/testdata/frobnitz/charts/mariner/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/mariner/values.yaml
rename to pkg/chartutil/testdata/frobnitz/charts/mariner/values.yaml
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/.helmignore b/pkg/chartutil/testdata/frobnitz_backslash/.helmignore
deleted file mode 100755
index 9973a57b8..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/.helmignore
+++ /dev/null
@@ -1 +0,0 @@
-ignore/
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/Chart.lock b/pkg/chartutil/testdata/frobnitz_backslash/Chart.lock
deleted file mode 100755
index 6fcc2ed9f..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/Chart.lock
+++ /dev/null
@@ -1,8 +0,0 @@
-dependencies:
-  - name: alpine
-    version: "0.1.0"
-    repository: https://example.com/charts
-  - name: mariner
-    version: "4.3.2"
-    repository: https://example.com/charts
-digest: invalid
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml b/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml
deleted file mode 100755
index b1dd40a5d..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/Chart.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: v1
-name: frobnitz_backslash
-description: This is a frobnitz.
-version: "1.2.3"
-keywords:
-  - frobnitz
-  - sprocket
-  - dodad
-maintainers:
-  - name: The Helm Team
-    email: helm@example.com
-  - name: Someone Else
-    email: nobody@example.com
-sources:
-  - https://example.com/foo/bar
-home: http://example.com
-icon: https://example.com/64x64.png
-annotations:
-  extrakey: extravalue
-  anotherkey: anothervalue
-dependencies:
-  - name: alpine
-    version: "0.1.0"
-    repository: https://example.com/charts
-  - name: mariner
-    version: "4.3.2"
-    repository: https://example.com/charts
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/INSTALL.txt b/pkg/chartutil/testdata/frobnitz_backslash/INSTALL.txt
deleted file mode 100755
index 2010438c2..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/INSTALL.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is an install document. The client may display this.
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/LICENSE b/pkg/chartutil/testdata/frobnitz_backslash/LICENSE
deleted file mode 100755
index 6121943b1..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE placeholder.
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/README.md b/pkg/chartutil/testdata/frobnitz_backslash/README.md
deleted file mode 100755
index 8cf4cc3d7..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Frobnitz
-
-This is an example chart.
-
-## Usage
-
-This is an example. It has no usage.
-
-## Development
-
-For developer info, see the top-level repository.
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/charts/_ignore_me b/pkg/chartutil/testdata/frobnitz_backslash/charts/_ignore_me
deleted file mode 100755
index 2cecca682..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/charts/_ignore_me
+++ /dev/null
@@ -1 +0,0 @@
-This should be ignored by the loader, but may be included in a chart.
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/Chart.yaml b/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/Chart.yaml
deleted file mode 100755
index 79e0d65db..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-name: alpine
-description: Deploy a basic Alpine Linux pod
-version: 0.1.0
-home: https://helm.sh/helm
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/README.md b/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/README.md
deleted file mode 100755
index b30b949dd..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-This example was generated using the command `helm create alpine`.
-
-The `templates/` directory contains a very simple pod resource with a
-couple of parameters.
-
-The `values.toml` file contains the default values for the
-`alpine-pod.yaml` template.
-
-You can install this example using `helm install ./alpine`.
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml b/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml
deleted file mode 100755
index 1c9dd5fa4..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-name: mast1
-description: A Helm chart for Kubernetes
-version: 0.1.0
-home: ""
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml b/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml
deleted file mode 100755
index 42c39c262..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default values for mast1.
-# This is a YAML-formatted file.
-# Declare name/value pairs to be passed into your templates.
-# name = "value"
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz
deleted file mode 100755
index 61cb62051..000000000
Binary files a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz and /dev/null differ
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml b/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml
deleted file mode 100755
index 5bbae10af..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: {{.Release.Name}}-{{.Chart.Name}}
-  labels:
-    app.kubernetes.io/managed-by: {{.Release.Service}}
-    chartName: {{.Chart.Name}}
-    chartVersion: {{.Chart.Version | quote}}
-spec:
-  restartPolicy: {{default "Never" .restart_policy}}
-  containers:
-  - name: waiter
-    image: "alpine:3.3"
-    command: ["/bin/sleep","9000"]
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/values.yaml b/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/values.yaml
deleted file mode 100755
index 6c2aab7ba..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/charts/alpine/values.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-# The pod name
-name: "my-alpine"
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz b/pkg/chartutil/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz
deleted file mode 100755
index 5648f6f6d..000000000
Binary files a/pkg/chartutil/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz and /dev/null differ
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/docs/README.md b/pkg/chartutil/testdata/frobnitz_backslash/docs/README.md
deleted file mode 100755
index d40747caf..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/docs/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This is a placeholder for documentation.
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/icon.svg b/pkg/chartutil/testdata/frobnitz_backslash/icon.svg
deleted file mode 100755
index 892130606..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/icon.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="1.0" width="256" height="256" id="test">
-  <desc>Example icon</desc>
-  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
-  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
-</svg>
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/ignore/me.txt b/pkg/chartutil/testdata/frobnitz_backslash/ignore/me.txt
deleted file mode 100755
index e69de29bb..000000000
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/templates/template.tpl b/pkg/chartutil/testdata/frobnitz_backslash/templates/template.tpl
deleted file mode 100755
index c651ee6a0..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/templates/template.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Hello {{.Name | default "world"}}
diff --git a/pkg/chartutil/testdata/frobnitz_backslash/values.yaml b/pkg/chartutil/testdata/frobnitz_backslash/values.yaml
deleted file mode 100755
index 61f501258..000000000
--- a/pkg/chartutil/testdata/frobnitz_backslash/values.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# A values file contains configuration.
-
-name: "Some Name"
-
-section:
-  name: "Name in a section"
diff --git a/pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz b/pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz
deleted file mode 100644
index 22c1fe572..000000000
Binary files a/pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz and /dev/null differ
diff --git a/pkg/chartutil/testdata/moby/Chart.yaml b/pkg/chartutil/testdata/moby/Chart.yaml
deleted file mode 100644
index a5f992c61..000000000
--- a/pkg/chartutil/testdata/moby/Chart.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-description: A Helm chart for Kubernetes
-name: moby
-version: 0.1.0
diff --git a/pkg/chartutil/testdata/moby/charts/pequod/Chart.yaml b/pkg/chartutil/testdata/moby/charts/pequod/Chart.yaml
deleted file mode 100644
index f1a8ef76b..000000000
--- a/pkg/chartutil/testdata/moby/charts/pequod/Chart.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-description: A Helm chart for Kubernetes
-name: pequod
-version: 0.1.0
diff --git a/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/Chart.yaml b/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/Chart.yaml
deleted file mode 100644
index a7ee7bf90..000000000
--- a/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/Chart.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-description: A Helm chart for Kubernetes
-name: ahab
-version: 0.1.0
diff --git a/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/values.yaml b/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/values.yaml
deleted file mode 100644
index eee6980fa..000000000
--- a/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/values.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-scope: ahab
-name: ahab
-boat: true
-nested:
-  foo: false
-  bar: true
diff --git a/pkg/chartutil/testdata/moby/charts/pequod/values.yaml b/pkg/chartutil/testdata/moby/charts/pequod/values.yaml
deleted file mode 100644
index d6e34b274..000000000
--- a/pkg/chartutil/testdata/moby/charts/pequod/values.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-scope: pequod
-name: pequod
diff --git a/pkg/chartutil/testdata/moby/charts/spouter/Chart.yaml b/pkg/chartutil/testdata/moby/charts/spouter/Chart.yaml
deleted file mode 100644
index 0525085b6..000000000
--- a/pkg/chartutil/testdata/moby/charts/spouter/Chart.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-description: A Helm chart for Kubernetes
-name: spouter
-version: 0.1.0
diff --git a/pkg/chartutil/testdata/moby/charts/spouter/values.yaml b/pkg/chartutil/testdata/moby/charts/spouter/values.yaml
deleted file mode 100644
index f71d92a9f..000000000
--- a/pkg/chartutil/testdata/moby/charts/spouter/values.yaml
+++ /dev/null
@@ -1 +0,0 @@
-scope: spouter
diff --git a/pkg/chartutil/testdata/moby/values.yaml b/pkg/chartutil/testdata/moby/values.yaml
deleted file mode 100644
index 2169d7566..000000000
--- a/pkg/chartutil/testdata/moby/values.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-scope: moby
-name: moby
-override: bad
-top: nope
-bottom: exists
-right: exists
-left: exists
-front: exists
-back: exists
-nested:
-  boat: true