diff --git a/api/register_v1beta1.go b/api/register_v1beta1.go
index 321c66d67..404b3e93e 100644
--- a/api/register_v1beta1.go
+++ b/api/register_v1beta1.go
@@ -12,7 +12,7 @@ var V1alpha1SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version:
 
 var (
 	V1alpha1SchemeBuilder = runtime.NewSchemeBuilder(v1addKnownTypes)
-	V1betaAddToScheme    = V1alpha1SchemeBuilder.AddToScheme
+	V1betaAddToScheme     = V1alpha1SchemeBuilder.AddToScheme
 )
 
 // Adds the list of known types to api.Scheme.
diff --git a/client/clientset/fake/extensions.go b/client/clientset/fake/extensions.go
index 209162f93..4f0d49d91 100644
--- a/client/clientset/fake/extensions.go
+++ b/client/clientset/fake/extensions.go
@@ -1,12 +1,13 @@
 package fake
 
 import (
-	"k8s.io/helm/client/clientset"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
 	testing "k8s.io/kubernetes/pkg/client/testing/core"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/watch"
+
+	"k8s.io/helm/client/clientset"
 )
 
 type FakeExtensionClient struct {
diff --git a/client/clientset/fake/release.go b/client/clientset/fake/release.go
index 439d11a7b..bfbe8ff59 100644
--- a/client/clientset/fake/release.go
+++ b/client/clientset/fake/release.go
@@ -50,9 +50,12 @@ func (mock *FakeRelease) List(opts api.ListOptions) (*aci.ReleaseList, error) {
 }
 
 // Create creates a new Release.
-func (mock *FakeRelease) Create(svc *aci.Release) (*aci.Release, error) {
+func (mock *FakeRelease) Create(r *aci.Release) (*aci.Release, error) {
+	if r != nil {
+		r.Namespace = mock.ns
+	}
 	obj, err := mock.Fake.
-		Invokes(testing.NewCreateAction(certResource, mock.ns, svc), &aci.Release{})
+		Invokes(testing.NewCreateAction(certResource, mock.ns, r), &aci.Release{})
 
 	if obj == nil {
 		return nil, err
@@ -61,9 +64,12 @@ func (mock *FakeRelease) Create(svc *aci.Release) (*aci.Release, error) {
 }
 
 // Update updates a Release.
-func (mock *FakeRelease) Update(svc *aci.Release) (*aci.Release, error) {
+func (mock *FakeRelease) Update(r *aci.Release) (*aci.Release, error) {
+	if r != nil {
+		r.Namespace = mock.ns
+	}
 	obj, err := mock.Fake.
-		Invokes(testing.NewUpdateAction(certResource, mock.ns, svc), &aci.Release{})
+		Invokes(testing.NewUpdateAction(certResource, mock.ns, r), &aci.Release{})
 
 	if obj == nil {
 		return nil, err
@@ -79,9 +85,12 @@ func (mock *FakeRelease) Delete(name string) error {
 	return err
 }
 
-func (mock *FakeRelease) UpdateStatus(srv *aci.Release) (*aci.Release, error) {
+func (mock *FakeRelease) UpdateStatus(r *aci.Release) (*aci.Release, error) {
+	if r != nil {
+		r.Namespace = mock.ns
+	}
 	obj, err := mock.Fake.
-		Invokes(testing.NewUpdateSubresourceAction(certResource, "status", mock.ns, srv), &aci.Release{})
+		Invokes(testing.NewUpdateSubresourceAction(certResource, "status", mock.ns, r), &aci.Release{})
 
 	if obj == nil {
 		return nil, err
diff --git a/pkg/storage/driver/releases.go b/pkg/storage/driver/releases.go
index 960b87b0e..9bf5ebb5d 100644
--- a/pkg/storage/driver/releases.go
+++ b/pkg/storage/driver/releases.go
@@ -372,6 +372,10 @@ func newReleasesObject(key string, rls *rspb.Release, lbs labels) (*rapi.Release
 
 	// create and return release object
 	r := &rapi.Release{
+		TypeMeta: unversioned.TypeMeta{
+			Kind:       "Release",
+			APIVersion: "helm.sh/v1alpha1",
+		},
 		ObjectMeta: api.ObjectMeta{
 			Name:   key,
 			Labels: lbs.toMap(),
diff --git a/pkg/storage/driver/releases_test.go b/pkg/storage/driver/releases_test.go
index 4e51424a3..1ebc05847 100644
--- a/pkg/storage/driver/releases_test.go
+++ b/pkg/storage/driver/releases_test.go
@@ -19,11 +19,11 @@ import (
 	"testing"
 
 	"github.com/gogo/protobuf/proto"
+	"k8s.io/kubernetes/pkg/runtime"
 
 	_ "k8s.io/helm/api/install"
 	"k8s.io/helm/client/clientset/fake"
 	rspb "k8s.io/helm/pkg/proto/hapi/release"
-	"k8s.io/kubernetes/pkg/runtime"
 )
 
 // newTestFixture initializes a FakeReleaseInterface.
@@ -42,6 +42,7 @@ func initFakeTPRs(t *testing.T, releases ...*rspb.Release) []runtime.Object {
 		if err != nil {
 			t.Fatalf("Failed to create configmap: %s", err)
 		}
+		r.Namespace = "default"
 		var obj runtime.Object = r
 		objects = append(objects, obj)
 	}
@@ -83,7 +84,7 @@ func TestUNcompressedReleaseGet(t *testing.T) {
 	rel := releaseStub(name, vers, namespace, rspb.Status_DEPLOYED)
 
 	// Create a test fixture which contains an uncompressed release
-	cfgmap, err := newReleasesObject(key, rel, nil)
+	r, err := newReleasesObject(key, rel, nil)
 	if err != nil {
 		t.Fatalf("Failed to create configmap: %s", err)
 	}
@@ -91,8 +92,8 @@ func TestUNcompressedReleaseGet(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to marshal release: %s", err)
 	}
-	cfgmap.Spec.Data.Inline = base64.StdEncoding.EncodeToString(b)
-	releases := NewReleases(fake.NewFakeExtensionClient(initFakeTPRs(t, rel)...).Releases("test"))
+	r.Spec.Data = base64.StdEncoding.EncodeToString(b)
+	releases := NewReleases(fake.NewFakeExtensionClient(initFakeTPRs(t, rel)...).Releases("default"))
 
 	// get release with key
 	got, err := releases.Get(key)