diff --git a/communicator/ssh/communicator.go b/communicator/ssh/communicator.go
index 6963d8eb6..434176383 100644
--- a/communicator/ssh/communicator.go
+++ b/communicator/ssh/communicator.go
@@ -55,7 +55,6 @@ type Communicator struct {
 	client          *ssh.Client
 	config          *sshConfig
 	conn            net.Conn
-	address         string
 	cancelKeepAlive context.CancelFunc
 
 	lock sync.Mutex
diff --git a/communicator/ssh/communicator_test.go b/communicator/ssh/communicator_test.go
index f2962c928..d71044320 100644
--- a/communicator/ssh/communicator_test.go
+++ b/communicator/ssh/communicator_test.go
@@ -99,6 +99,7 @@ func newMockLineServer(t *testing.T, signer ssh.Signer, pubKey string) string {
 			t.Log("Accepted channel")
 
 			go func(in <-chan *ssh.Request) {
+				defer channel.Close()
 				for req := range in {
 					// since this channel's requests are serviced serially,
 					// this will block keepalive probes, and can simulate a
@@ -112,8 +113,6 @@ func newMockLineServer(t *testing.T, signer ssh.Signer, pubKey string) string {
 					}
 				}
 			}(requests)
-
-			defer channel.Close()
 		}
 		conn.Close()
 	}()
@@ -714,34 +713,6 @@ func TestScriptPath_randSeed(t *testing.T) {
 	}
 }
 
-const testClientPrivateKey = `-----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAxOgNXOJ/jrRDxBZTSk2X9otNy9zcpUmJr5ifDi5sy7j2ZiQS
-beBt1Wf+tLNWis8Cyq06ttEvjjRuM75yucyD6GrqDTXVCSm4PeOIQeDhPhw26wYZ
-O0h/mFgrAiCwaEl8AFXVBInOhVn/0nqgUpkwckh76bjTsNeifkiugK3cfJOuBdrU
-ZGbgugJjmYo4Cmv7ECo1gCFT5N+BAjOji3z3N5ClBH5HaWC77jH7kTH0k5cZ+ZRQ
-tG9EqLyvWlnzTAR/Yly0JInkOa16Ms1Au5sIJwEoJfHKsNVK06IlLob53nblwYW0
-H5gv1Kb/rS+nUkpPtA5YFShB7iZnPLPPv6qXSwIDAQABAoIBAC0UY1rMkB9/rbQK
-2G6+bPgI1HrDydAdkeQdsOxyPH43jlG8GGwHYZ3l/S4pkLqewijcmACay6Rm5IP8
-Kg/XfquLLqJvnKJIZuHkYaGTdn3dv8T21Hf6FRwvs0j9auW1TSpWfDpZwmpNPIBX
-irTeVXUUmynbIrvt4km/IhRbuYrbbb964CLYD1DCl3XssXxoRNvPpc5EtOuyDorA
-5g1hvZR1FqbOAmOuNQMYJociMuWB8mCaHb+o1Sg4A65OLXxoKs0cuwInJ/n/R4Z3
-+GrV+x5ypBMxXgjjQtKMLEOujkvxs1cp34hkbhKMHHXxbMu5jl74YtGGsLLk90rq
-ieZGIgECgYEA49OM9mMCrDoFUTZdJaSARA/MOXkdQgrqVTv9kUHee7oeMZZ6lS0i
-bPU7g+Bq+UAN0qcw9x992eAElKjBA71Q5UbZYWh29BDMZd8bRJmwz4P6aSMoYLWI
-Sr31caJU9LdmPFatarNeehjSJtlTuoZD9+NElnnUwNaTeOOo5UdhTQsCgYEA3UGm
-QWoDUttFwK9oL2KL8M54Bx6EzNhnyk03WrqBbR7PJcPKnsF0R/0soQ+y0FW0r8RJ
-TqG6ze5fUJII72B4GlMTQdP+BIvaKQttwWQTNIjbbv4NksF445gdVOO1xi9SvQ7k
-uvMVxOb+1jL3HAFa3furWu2tJRDs6dhuaILLxsECgYEAhnhlKUBDYZhVbxvhWsh/
-lKymY/3ikQqUSX7BKa1xPiIalDY3YDllql4MpMgfG8L85asdMZ96ztB0o7H/Ss/B
-IbLxt5bLLz+DBVXsaE82lyVU9h10RbCgI01/w3SHJHHjfBXFAcehKfvgfmGkE+IP
-2A5ie1aphrCgFqh5FetNuQUCgYEAibL42I804FUtFR1VduAa/dRRqQSaW6528dWa
-lLGsKRBalUNEEAeP6dmr89UEUVp1qEo94V0QGGe5FDi+rNPaC3AWdQqNdaDgNlkx
-hoFU3oYqIuqj4ejc5rBd2N4a2+vJz3W8bokozDGC+iYf2mMRfUPKwj1XW9Er0OFs
-3UhBsEECgYEAto/iJB7ZlCM7EyV9JW0tsEt83rbKMQ/Ex0ShbBIejej0Xx7bwx60
-tVgay+bzJnNkXu6J4XVI98A/WsdI2kW4hL0STYdHV5HVA1l87V4ZbvTF2Bx8a8RJ
-OF3UjpMTWKqOprw9nAu5VuwNRVzORF8ER8rgGeaR2/gsSvIYFy9VXq8=
------END RSA PRIVATE KEY-----`
-
 var testClientPublicKey = `ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDE6A1c4n+OtEPEFlNKTZf2i03L3NylSYmvmJ8OLmzLuPZmJBJt4G3VZ/60s1aKzwLKrTq20S+ONG4zvnK5zIPoauoNNdUJKbg944hB4OE+HDbrBhk7SH+YWCsCILBoSXwAVdUEic6FWf/SeqBSmTBySHvpuNOw16J+SK6Ardx8k64F2tRkZuC6AmOZijgKa/sQKjWAIVPk34ECM6OLfPc3kKUEfkdpYLvuMfuRMfSTlxn5lFC0b0SovK9aWfNMBH9iXLQkieQ5rXoyzUC7mwgnASgl8cqw1UrToiUuhvneduXBhbQfmC/Upv+tL6dSSk+0DlgVKEHuJmc8s8+/qpdL`
 
 func acceptUserPass(goodUser, goodPass string) func(ssh.ConnMetadata, []byte) (*ssh.Permissions, error) {
diff --git a/communicator/ssh/password_test.go b/communicator/ssh/password_test.go
index e513716d0..219669e4b 100644
--- a/communicator/ssh/password_test.go
+++ b/communicator/ssh/password_test.go
@@ -3,18 +3,8 @@ package ssh
 import (
 	"reflect"
 	"testing"
-
-	"golang.org/x/crypto/ssh"
 )
 
-func TestPasswordKeyboardInteractive_Impl(t *testing.T) {
-	var raw interface{}
-	raw = PasswordKeyboardInteractive("foo")
-	if _, ok := raw.(ssh.KeyboardInteractiveChallenge); !ok {
-		t.Fatal("PasswordKeyboardInteractive must implement KeyboardInteractiveChallenge")
-	}
-}
-
 func TestPasswordKeybardInteractive_Challenge(t *testing.T) {
 	p := PasswordKeyboardInteractive("foo")
 	result, err := p("foo", "bar", []string{"one", "two"}, nil)
diff --git a/communicator/ssh/provisioner.go b/communicator/ssh/provisioner.go
index 1668da0df..a3fa80c42 100644
--- a/communicator/ssh/provisioner.go
+++ b/communicator/ssh/provisioner.go
@@ -412,7 +412,7 @@ func readPrivateKey(pk string) (ssh.AuthMethod, error) {
 }
 
 func connectToAgent(connInfo *connectionInfo) (*sshAgent, error) {
-	if connInfo.Agent != true {
+	if !connInfo.Agent {
 		// No agent configured
 		return nil, nil
 	}
@@ -547,13 +547,6 @@ func (s *sshAgent) sortSigners(signers []ssh.Signer) {
 			continue
 		}
 	}
-
-	ss := []string{}
-	for _, signer := range signers {
-		pk := signer.PublicKey()
-		k := pk.(*agent.Key)
-		ss = append(ss, k.Comment)
-	}
 }
 
 func (s *sshAgent) Signers() ([]ssh.Signer, error) {
diff --git a/communicator/ssh/ssh_test.go b/communicator/ssh/ssh_test.go
index 9cd10a0a3..2726405f9 100644
--- a/communicator/ssh/ssh_test.go
+++ b/communicator/ssh/ssh_test.go
@@ -81,10 +81,10 @@ func generateSSHKey(t *testing.T, idFile string) ssh.PublicKey {
 	}
 
 	privFile, err := os.OpenFile(idFile, os.O_RDWR|os.O_CREATE, 0600)
-	defer privFile.Close()
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer privFile.Close()
 	privPEM := &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}
 	if err := pem.Encode(privFile, privPEM); err != nil {
 		t.Fatal(err)