diff --git a/cmd/helm/rollback_test.go b/cmd/helm/rollback_test.go
index 9ca921557..6d38e16eb 100644
--- a/cmd/helm/rollback_test.go
+++ b/cmd/helm/rollback_test.go
@@ -64,6 +64,12 @@ func TestRollbackCmd(t *testing.T) {
 		cmd:    "rollback funny-honey",
 		golden: "output/rollback-no-revision.txt",
 		rels:   rels,
+	}, {
+		name:      "rollback a release with non-existent version",
+		cmd:       "rollback funny-honey 3",
+		golden:    "output/rollback-non-existent-version.txt",
+		rels:      rels,
+		wantError: true,
 	}, {
 		name:      "rollback a release without release name",
 		cmd:       "rollback",
diff --git a/cmd/helm/testdata/output/rollback-non-existent-version.txt b/cmd/helm/testdata/output/rollback-non-existent-version.txt
new file mode 100644
index 000000000..9c2e10e17
--- /dev/null
+++ b/cmd/helm/testdata/output/rollback-non-existent-version.txt
@@ -0,0 +1 @@
+Error: release has no 3 version