diff --git a/pkg/storage/driver/cfgmaps_test.go b/pkg/storage/driver/cfgmaps_test.go
index 9df12877b..13cc09b01 100644
--- a/pkg/storage/driver/cfgmaps_test.go
+++ b/pkg/storage/driver/cfgmaps_test.go
@@ -19,9 +19,9 @@ import (
 	"testing"
 
 	"github.com/gogo/protobuf/proto"
+	"k8s.io/kubernetes/pkg/api"
 
 	rspb "k8s.io/helm/pkg/proto/hapi/release"
-	"k8s.io/kubernetes/pkg/api"
 )
 
 func TestConfigMapName(t *testing.T) {
diff --git a/pkg/storage/driver/mock_test.go b/pkg/storage/driver/mock_test.go
index 3bb5f804c..3c546a45b 100644
--- a/pkg/storage/driver/mock_test.go
+++ b/pkg/storage/driver/mock_test.go
@@ -20,10 +20,11 @@ import (
 	"fmt"
 	"testing"
 
-	rspb "k8s.io/helm/pkg/proto/hapi/release"
 	"k8s.io/kubernetes/pkg/api"
 	kberrs "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
+
+	rspb "k8s.io/helm/pkg/proto/hapi/release"
 )
 
 func releaseStub(name string, vers int32, code rspb.Status_Code) *rspb.Release {
diff --git a/pkg/tiller/hooks.go b/pkg/tiller/hooks.go
index 281a234ba..c03107cbe 100644
--- a/pkg/tiller/hooks.go
+++ b/pkg/tiller/hooks.go
@@ -23,6 +23,7 @@ import (
 	"strings"
 
 	"github.com/ghodss/yaml"
+
 	"k8s.io/helm/pkg/proto/hapi/release"
 )
 
diff --git a/pkg/tiller/release_history.go b/pkg/tiller/release_history.go
index 003bf8c03..341079575 100644
--- a/pkg/tiller/release_history.go
+++ b/pkg/tiller/release_history.go
@@ -18,6 +18,7 @@ package tiller
 
 import (
 	"golang.org/x/net/context"
+
 	tpb "k8s.io/helm/pkg/proto/hapi/services"
 	relutil "k8s.io/helm/pkg/releaseutil"
 )
diff --git a/pkg/tiller/release_history_test.go b/pkg/tiller/release_history_test.go
index 75139c51f..5df98410f 100644
--- a/pkg/tiller/release_history_test.go
+++ b/pkg/tiller/release_history_test.go
@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	"k8s.io/helm/pkg/helm"
-
 	rpb "k8s.io/helm/pkg/proto/hapi/release"
 	tpb "k8s.io/helm/pkg/proto/hapi/services"
 )
diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go
index ee36d322e..e043a75c5 100644
--- a/pkg/tiller/release_server.go
+++ b/pkg/tiller/release_server.go
@@ -25,11 +25,10 @@ import (
 	"regexp"
 	"strings"
 
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
-
 	"github.com/technosophos/moniker"
 	ctx "golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/metadata"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/typed/discovery"