diff --git a/drivers/generic/generic.go b/drivers/generic/generic.go
index 0cd24074e7..5beb39a23f 100644
--- a/drivers/generic/generic.go
+++ b/drivers/generic/generic.go
@@ -10,7 +10,6 @@ import (
 	"github.com/codegangsta/cli"
 	"github.com/docker/machine/drivers"
 	"github.com/docker/machine/provider"
-	"github.com/docker/machine/ssh"
 	"github.com/docker/machine/state"
 	"github.com/docker/machine/utils"
 )
@@ -144,11 +143,7 @@ func (d *Driver) Create() error {
 		return err
 	}
 
-	log.Infof("Waiting for SSH...")
-
-	if err := ssh.WaitForTCP(fmt.Sprintf("%s:%d", d.IPAddress, d.SSHPort)); err != nil {
-		return err
-	}
+	log.Debugf("IP: %s", d.IPAddress)
 
 	return nil
 }
@@ -195,11 +190,7 @@ func (d *Driver) Remove() error {
 func (d *Driver) Restart() error {
 	log.Debug("Restarting...")
 
-	cmd, err := drivers.GetSSHCommandFromDriver(d, "sudo shutdown -r now")
-	if err != nil {
-		return err
-	}
-	if err := cmd.Run(); err != nil {
+	if _, err := drivers.RunSSHCommandFromDriver(d, "sudo shutdown -r now"); err != nil {
 		return err
 	}
 
@@ -209,11 +200,7 @@ func (d *Driver) Restart() error {
 func (d *Driver) Kill() error {
 	log.Debug("Killing...")
 
-	cmd, err := drivers.GetSSHCommandFromDriver(d, "sudo shutdown -P now")
-	if err != nil {
-		return err
-	}
-	if err := cmd.Run(); err != nil {
+	if _, err := drivers.RunSSHCommandFromDriver(d, "sudo shutdown -P now"); err != nil {
 		return err
 	}
 
diff --git a/drivers/generic/generic_test.go b/drivers/generic/generic_test.go
new file mode 100644
index 0000000000..0d16b43f98
--- /dev/null
+++ b/drivers/generic/generic_test.go
@@ -0,0 +1 @@
+package generic
diff --git a/libmachine/provision/ubuntu.go b/libmachine/provision/ubuntu.go
index a3ce4d2924..b2377dc5b5 100644
--- a/libmachine/provision/ubuntu.go
+++ b/libmachine/provision/ubuntu.go
@@ -75,7 +75,7 @@ func (provisioner *UbuntuProvisioner) Package(name string, action pkgaction.Pack
 
 func (provisioner *UbuntuProvisioner) dockerDaemonResponding() bool {
 	if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {
-		log.Warn("Error getting SSH command to check if the daemon is up: %s", err)
+		log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)
 		return false
 	}