diff --git a/cmd/helm/testdata/output/upgrade-with-dependency-update.txt b/cmd/helm/testdata/output/upgrade-with-dependency-update.txt
index 0e7e5842e..3077c2f0a 100644
--- a/cmd/helm/testdata/output/upgrade-with-dependency-update.txt
+++ b/cmd/helm/testdata/output/upgrade-with-dependency-update.txt
@@ -4,6 +4,9 @@ LAST DEPLOYED: Fri Sep  2 22:04:05 1977
 NAMESPACE: default
 STATUS: deployed
 REVISION: 3
+CHART: chart-with-subchart-update
+VERSION: 0.0.1
+APP_VERSION:
 TEST SUITE: None
 NOTES:
 PARENT NOTES
diff --git a/cmd/helm/testdata/output/upgrade-with-install-timeout.txt b/cmd/helm/testdata/output/upgrade-with-install-timeout.txt
index 5d8d3a4ea..8e3c46457 100644
--- a/cmd/helm/testdata/output/upgrade-with-install-timeout.txt
+++ b/cmd/helm/testdata/output/upgrade-with-install-timeout.txt
@@ -4,4 +4,7 @@ LAST DEPLOYED: Fri Sep  2 22:04:05 1977
 NAMESPACE: default
 STATUS: deployed
 REVISION: 2
+CHART: testUpgradeChart
+VERSION: 0.1.3
+APP_VERSION:
 TEST SUITE: None
diff --git a/cmd/helm/testdata/output/upgrade-with-install.txt b/cmd/helm/testdata/output/upgrade-with-install.txt
index af61212bd..84d8d38e1 100644
--- a/cmd/helm/testdata/output/upgrade-with-install.txt
+++ b/cmd/helm/testdata/output/upgrade-with-install.txt
@@ -4,4 +4,7 @@ LAST DEPLOYED: Fri Sep  2 22:04:05 1977
 NAMESPACE: default
 STATUS: deployed
 REVISION: 2
+CHART: testUpgradeChart
+VERSION: 0.1.3
+APP_VERSION:
 TEST SUITE: None
diff --git a/cmd/helm/testdata/output/upgrade-with-reset-values.txt b/cmd/helm/testdata/output/upgrade-with-reset-values.txt
index 01f1c0ac8..bde4d839a 100644
--- a/cmd/helm/testdata/output/upgrade-with-reset-values.txt
+++ b/cmd/helm/testdata/output/upgrade-with-reset-values.txt
@@ -4,4 +4,7 @@ LAST DEPLOYED: Fri Sep  2 22:04:05 1977
 NAMESPACE: default
 STATUS: deployed
 REVISION: 5
+CHART: testUpgradeChart
+VERSION: 0.1.3
+APP_VERSION:
 TEST SUITE: None
diff --git a/cmd/helm/testdata/output/upgrade-with-reset-values2.txt b/cmd/helm/testdata/output/upgrade-with-reset-values2.txt
index fdd1d2db7..7a674b672 100644
--- a/cmd/helm/testdata/output/upgrade-with-reset-values2.txt
+++ b/cmd/helm/testdata/output/upgrade-with-reset-values2.txt
@@ -4,4 +4,7 @@ LAST DEPLOYED: Fri Sep  2 22:04:05 1977
 NAMESPACE: default
 STATUS: deployed
 REVISION: 6
+CHART: testUpgradeChart
+VERSION: 0.1.3
+APP_VERSION:
 TEST SUITE: None
diff --git a/cmd/helm/testdata/output/upgrade-with-timeout.txt b/cmd/helm/testdata/output/upgrade-with-timeout.txt
index be3a42368..38b08beca 100644
--- a/cmd/helm/testdata/output/upgrade-with-timeout.txt
+++ b/cmd/helm/testdata/output/upgrade-with-timeout.txt
@@ -4,4 +4,7 @@ LAST DEPLOYED: Fri Sep  2 22:04:05 1977
 NAMESPACE: default
 STATUS: deployed
 REVISION: 4
+CHART: testUpgradeChart
+VERSION: 0.1.3
+APP_VERSION:
 TEST SUITE: None
diff --git a/cmd/helm/testdata/output/upgrade-with-wait-for-jobs.txt b/cmd/helm/testdata/output/upgrade-with-wait-for-jobs.txt
index 500d07a11..3d67817ad 100644
--- a/cmd/helm/testdata/output/upgrade-with-wait-for-jobs.txt
+++ b/cmd/helm/testdata/output/upgrade-with-wait-for-jobs.txt
@@ -4,4 +4,7 @@ LAST DEPLOYED: Fri Sep  2 22:04:05 1977
 NAMESPACE: default
 STATUS: deployed
 REVISION: 3
+CHART: testUpgradeChart
+VERSION: 0.1.3
+APP_VERSION:
 TEST SUITE: None
diff --git a/cmd/helm/testdata/output/upgrade-with-wait.txt b/cmd/helm/testdata/output/upgrade-with-wait.txt
index 500d07a11..3d67817ad 100644
--- a/cmd/helm/testdata/output/upgrade-with-wait.txt
+++ b/cmd/helm/testdata/output/upgrade-with-wait.txt
@@ -4,4 +4,7 @@ LAST DEPLOYED: Fri Sep  2 22:04:05 1977
 NAMESPACE: default
 STATUS: deployed
 REVISION: 3
+CHART: testUpgradeChart
+VERSION: 0.1.3
+APP_VERSION:
 TEST SUITE: None
diff --git a/cmd/helm/testdata/output/upgrade.txt b/cmd/helm/testdata/output/upgrade.txt
index bea42db54..982b21865 100644
--- a/cmd/helm/testdata/output/upgrade.txt
+++ b/cmd/helm/testdata/output/upgrade.txt
@@ -4,4 +4,7 @@ LAST DEPLOYED: Fri Sep  2 22:04:05 1977
 NAMESPACE: default
 STATUS: deployed
 REVISION: 3
+CHART: testUpgradeChart
+VERSION: 0.1.3
+APP_VERSION:
 TEST SUITE: None
diff --git a/cmd/helm/upgrade.go b/cmd/helm/upgrade.go
index e7c6dd166..da1b93fd3 100644
--- a/cmd/helm/upgrade.go
+++ b/cmd/helm/upgrade.go
@@ -147,7 +147,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 					if err != nil {
 						return err
 					}
-					return outfmt.Write(out, &statusPrinter{rel, settings.Debug, false, false, false})
+					return outfmt.Write(out, &statusPrinter{rel, settings.Debug, false, false, true})
 				} else if err != nil {
 					return err
 				}
@@ -233,7 +233,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				fmt.Fprintf(out, "Release %q has been upgraded. Happy Helming!\n", args[0])
 			}
 
-			return outfmt.Write(out, &statusPrinter{rel, settings.Debug, false, false, false})
+			return outfmt.Write(out, &statusPrinter{rel, settings.Debug, false, false, true})
 		},
 	}
 
diff --git a/internal/test/test.go b/internal/test/test.go
index e6821282c..2757cd6c2 100644
--- a/internal/test/test.go
+++ b/internal/test/test.go
@@ -92,5 +92,7 @@ func update(filename string, in []byte) error {
 }
 
 func normalize(in []byte) []byte {
-	return bytes.Replace(in, []byte("\r\n"), []byte("\n"), -1)
+	in = bytes.Replace(in, []byte("\r\n"), []byte("\n"), -1)
+	// Trim trailing space
+	return bytes.Replace(in, []byte(" \n"), []byte("\n"), -1)
 }