diff --git a/tests/suites/simple_install_uninstall_test.go b/tests/suites/simple_install_uninstall_test.go
index 1a1f8429..2cfc9f36 100644
--- a/tests/suites/simple_install_uninstall_test.go
+++ b/tests/suites/simple_install_uninstall_test.go
@@ -11,8 +11,8 @@ import (
 
 	// log "github.com/sirupsen/logrus"
 
-	kubectl "github.com/mesosphere/kudo-cassandra-operator/tests/utils/kubectl"
 	k8s "github.com/mesosphere/kudo-cassandra-operator/tests/utils/k8s"
+	kubectl "github.com/mesosphere/kudo-cassandra-operator/tests/utils/kubectl"
 	kudo "github.com/mesosphere/kudo-cassandra-operator/tests/utils/kudo"
 )
 
diff --git a/tests/utils/k8s/k8s.go b/tests/utils/k8s/k8s.go
index a8ffcdd6..4f0e2b20 100644
--- a/tests/utils/k8s/k8s.go
+++ b/tests/utils/k8s/k8s.go
@@ -3,16 +3,16 @@ package k8s
 import (
 	log "github.com/sirupsen/logrus"
 
-	"k8s.io/client-go/kubernetes"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
 
 	kubectl "github.com/mesosphere/kudo-cassandra-operator/tests/utils/kubectl"
 )
 
 var (
-	clientset *kubernetes.Clientset
+	clientset      *kubernetes.Clientset
 	kubectlOptions *kubectl.KubectlOptions
 )
 
diff --git a/tests/utils/kudo/kudo.go b/tests/utils/kudo/kudo.go
index d56f0007..41f455d4 100644
--- a/tests/utils/kudo/kudo.go
+++ b/tests/utils/kudo/kudo.go
@@ -19,7 +19,7 @@ import (
 
 var (
 	kubectlOptions *kubectl.KubectlOptions
-	kudo *versioned.Clientset
+	kudo           *versioned.Clientset
 )
 
 // TODO(mpereira) return err?
@@ -88,7 +88,7 @@ func WaitForOperatorDeployStatus(
 
 			if err != nil {
 				log.Errorf(
-					"Error attempting to get operator (instance='%s', namespace='%s') " +
+					"Error attempting to get operator (instance='%s', namespace='%s') "+
 						"deploy status: %s",
 					instanceName,
 					namespaceName,
@@ -99,7 +99,7 @@ func WaitForOperatorDeployStatus(
 
 			if status == nil {
 				log.Warnf(
-					"Waiting for operator (instance='%s', namespace='%s') deploy status " +
+					"Waiting for operator (instance='%s', namespace='%s') deploy status "+
 						"to be '%s', is not available",
 					instanceName,
 					namespaceName,
@@ -111,7 +111,7 @@ func WaitForOperatorDeployStatus(
 
 			if expectedStatus != *status {
 				log.Infof(
-					"Waiting for '%s' (instance='%s', namespace='%s') deploy status " +
+					"Waiting for '%s' (instance='%s', namespace='%s') deploy status "+
 						"to be '%s', is '%s'",
 					instanceName,
 					namespaceName,
@@ -138,7 +138,7 @@ func WaitForOperatorDeployStatus(
 func WaitForOperatorDeployInProgress(
 	namespaceName string, instanceName string,
 ) error {
-	retryDelay := time.Second*2
+	retryDelay := time.Second * 2
 	var retryAttempts uint = 10
 
 	return WaitForOperatorDeployStatus(
@@ -153,7 +153,7 @@ func WaitForOperatorDeployInProgress(
 func WaitForOperatorDeployComplete(
 	namespaceName string, instanceName string,
 ) error {
-	retryDelay := time.Second*10
+	retryDelay := time.Second * 10
 	var retryAttempts uint = 12
 
 	return WaitForOperatorDeployStatus(