diff --git a/builder/vmware/step_wait_for_ssh.go b/builder/vmware/step_wait_for_ssh.go
index 9df52f82e..bf4ce815c 100644
--- a/builder/vmware/step_wait_for_ssh.go
+++ b/builder/vmware/step_wait_for_ssh.go
@@ -25,7 +25,7 @@ import (
 //   communicator packer.Communicator
 type stepWaitForSSH struct {
 	cancel bool
-	comm packer.Communicator
+	comm   packer.Communicator
 }
 
 func (s *stepWaitForSSH) Run(state map[string]interface{}) multistep.StepAction {
diff --git a/communicator/ssh/communicator.go b/communicator/ssh/communicator.go
index d29b81598..11b691167 100644
--- a/communicator/ssh/communicator.go
+++ b/communicator/ssh/communicator.go
@@ -15,7 +15,7 @@ import (
 type comm struct {
 	client *ssh.ClientConn
 	config *Config
-	conn net.Conn
+	conn   net.Conn
 }
 
 // Config is the structure used to configure the SSH communicator.
diff --git a/communicator/ssh/communicator_test.go b/communicator/ssh/communicator_test.go
index 42ba0bb7e..8379ad251 100644
--- a/communicator/ssh/communicator_test.go
+++ b/communicator/ssh/communicator_test.go
@@ -125,7 +125,7 @@ func TestNew_Invalid(t *testing.T) {
 
 	config := &Config{
 		Connection: conn,
-		SSHConfig: clientConfig,
+		SSHConfig:  clientConfig,
 	}
 
 	_, err := New(config)
@@ -152,7 +152,7 @@ func TestStart(t *testing.T) {
 
 	config := &Config{
 		Connection: conn,
-		SSHConfig: clientConfig,
+		SSHConfig:  clientConfig,
 	}
 
 	client, err := New(config)
diff --git a/communicator/ssh/connect.go b/communicator/ssh/connect.go
index edca0db17..3ea91ce97 100644
--- a/communicator/ssh/connect.go
+++ b/communicator/ssh/connect.go
@@ -12,6 +12,6 @@ import (
 func ConnectFunc(network, addr string) func() (net.Conn, error) {
 	return func() (net.Conn, error) {
 		log.Printf("Opening conn for SSH to %s %s", network, addr)
-		return net.DialTimeout(network, addr, 15 * time.Second)
+		return net.DialTimeout(network, addr, 15*time.Second)
 	}
 }