diff --git a/cmd/kops/validate.go b/cmd/kops/validate.go
index 3ef68a54ef..3892b3c622 100644
--- a/cmd/kops/validate.go
+++ b/cmd/kops/validate.go
@@ -17,8 +17,9 @@ limitations under the License.
 package main
 
 import (
-	"github.com/spf13/cobra"
 	"io"
+
+	"github.com/spf13/cobra"
 	"k8s.io/kops/cmd/kops/util"
 )
 
diff --git a/cmd/kops/validate_cluster.go b/cmd/kops/validate_cluster.go
index 2140e3b92e..3975d26f62 100644
--- a/cmd/kops/validate_cluster.go
+++ b/cmd/kops/validate_cluster.go
@@ -18,8 +18,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"io"
+	"os"
+	"strings"
+
+	"github.com/spf13/cobra"
 	"k8s.io/kops/cmd/kops/util"
 	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/validation"
@@ -28,8 +31,6 @@ import (
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
-	"os"
-	"strings"
 )
 
 type ValidateClusterOptions struct {
diff --git a/pkg/validation/node_api_adapter.go b/pkg/validation/node_api_adapter.go
index d556ffacf3..fe0bfbbcea 100644
--- a/pkg/validation/node_api_adapter.go
+++ b/pkg/validation/node_api_adapter.go
@@ -18,11 +18,12 @@ package validation
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
 	"k8s.io/kubernetes/pkg/util/wait"
-	"time"
 )
 
 const (
diff --git a/pkg/validation/node_api_adapter_test.go b/pkg/validation/node_api_adapter_test.go
index 71a709bc49..326bca4866 100644
--- a/pkg/validation/node_api_adapter_test.go
+++ b/pkg/validation/node_api_adapter_test.go
@@ -19,8 +19,8 @@ package validation
 import (
 	"testing"
 	"time"
-	//k8sapi "k8s.io/kubernetes/pkg/api"
-	k8sapi "k8s.io/kubernetes/pkg/api/v1"
+
+	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake"
 )
 
@@ -33,7 +33,7 @@ import (
 //}
 
 func TestWaitForNodeToBeReady(t *testing.T) {
-	conditions := []k8sapi.NodeCondition{{Type: "Ready", Status: "True"}}
+	conditions := []v1.NodeCondition{{Type: "Ready", Status: "True"}}
 	nodeName := "node-foo"
 	nodeAA := setupNodeAA(t, conditions, nodeName)
 
@@ -47,7 +47,7 @@ func TestWaitForNodeToBeReady(t *testing.T) {
 }
 
 func TestWaitForNodeToBeNotReady(t *testing.T) {
-	conditions := []k8sapi.NodeCondition{{Type: "Ready", Status: "False"}}
+	conditions := []v1.NodeCondition{{Type: "Ready", Status: "False"}}
 	nodeName := "node-foo"
 	nodeAA := setupNodeAA(t, conditions, nodeName)
 
@@ -64,11 +64,11 @@ func TestWaitForNodeToBeNotReady(t *testing.T) {
 //
 //}
 
-func setupNodeAA(t *testing.T, conditions []k8sapi.NodeCondition, nodeName string) *NodeAPIAdapter {
-	node := &k8sapi.Node{
-		ObjectMeta: k8sapi.ObjectMeta{Name: nodeName},
-		Spec:       k8sapi.NodeSpec{Unschedulable: false},
-		Status:     k8sapi.NodeStatus{Conditions: conditions},
+func setupNodeAA(t *testing.T, conditions []v1.NodeCondition, nodeName string) *NodeAPIAdapter {
+	node := &v1.Node{
+		ObjectMeta: v1.ObjectMeta{Name: nodeName},
+		Spec:       v1.NodeSpec{Unschedulable: false},
+		Status:     v1.NodeStatus{Conditions: conditions},
 	}
 
 	c := fake.NewSimpleClientset(node)
diff --git a/pkg/validation/validate_cluster_test.go b/pkg/validation/validate_cluster_test.go
index f0b4cb1208..3f8ea346b3 100644
--- a/pkg/validation/validate_cluster_test.go
+++ b/pkg/validation/validate_cluster_test.go
@@ -17,9 +17,8 @@ limitations under the License.
 package validation
 
 import (
-	"testing"
-
 	"fmt"
+	"testing"
 
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/v1"