diff --git a/drivers/openstack/client.go b/drivers/openstack/client.go
index 64905ba..00421be 100644
--- a/drivers/openstack/client.go
+++ b/drivers/openstack/client.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/docker/machine/log"
-	"github.com/docker/machine/utils"
-	"github.com/docker/machine/version"
+	"github.com/docker/machine/libmachine/log"
+	"github.com/docker/machine/libmachine/mcnutils"
+	"github.com/docker/machine/libmachine/version"
 	"github.com/rackspace/gophercloud"
 	"github.com/rackspace/gophercloud/openstack"
 	"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs"
@@ -136,7 +136,7 @@ func (c *GenericClient) DeleteInstance(d *Driver) error {
 }
 
 func (c *GenericClient) WaitForInstanceStatus(d *Driver, status string) error {
-	return utils.WaitForSpecificOrError(func() (bool, error) {
+	return mcnutils.WaitForSpecificOrError(func() (bool, error) {
 		current, err := servers.Get(c.Compute, d.MachineId).Extract()
 		if err != nil {
 			return true, err
@@ -437,7 +437,7 @@ func (c *GenericClient) Authenticate(d *Driver) error {
 		return err
 	}
 
-	provider.UserAgent.Prepend(fmt.Sprintf("docker-machine/v%s", version.Version))
+	provider.UserAgent.Prepend(fmt.Sprintf("docker-machine/v%d", version.ApiVersion))
 
 	if d.Insecure {
 		// Configure custom TLS settings.
diff --git a/drivers/openstack/client_test.go b/drivers/openstack/client_test.go
deleted file mode 100644
index a0d778c..0000000
--- a/drivers/openstack/client_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package openstack
diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go
index 7e25efa..e93ecfd 100644
--- a/drivers/openstack/openstack.go
+++ b/drivers/openstack/openstack.go
@@ -7,11 +7,11 @@ import (
 	"time"
 
 	"github.com/codegangsta/cli"
-	"github.com/docker/machine/drivers"
-	"github.com/docker/machine/log"
-	"github.com/docker/machine/ssh"
-	"github.com/docker/machine/state"
-	"github.com/docker/machine/utils"
+	"github.com/docker/machine/libmachine/drivers"
+	"github.com/docker/machine/libmachine/log"
+	"github.com/docker/machine/libmachine/mcnutils"
+	"github.com/docker/machine/libmachine/ssh"
+	"github.com/docker/machine/libmachine/state"
 )
 
 type Driver struct {
@@ -42,9 +42,14 @@ type Driver struct {
 	client           Client
 }
 
+const (
+	defaultSSHUser       = "root"
+	defaultSSHPort       = 22
+	defaultActiveTimeout = 200
+)
+
 func init() {
 	drivers.Register("openstack", &drivers.RegisteredDriver{
-		New:            NewDriver,
 		GetCreateFlags: GetCreateFlags,
 	})
 }
@@ -158,35 +163,36 @@ func GetCreateFlags() []cli.Flag {
 		cli.StringFlag{
 			Name:  "openstack-ssh-user",
 			Usage: "OpenStack SSH user",
-			Value: "root",
+			Value: defaultSSHUser,
 		},
 		cli.IntFlag{
 			Name:  "openstack-ssh-port",
 			Usage: "OpenStack SSH port",
-			Value: 22,
+			Value: defaultSSHPort,
 		},
 		cli.IntFlag{
 			Name:  "openstack-active-timeout",
 			Usage: "OpenStack active timeout",
-			Value: 200,
+			Value: defaultActiveTimeout,
 		},
 	}
 }
 
-func NewDriver(machineName string, storePath string, caCert string, privateKey string) (drivers.Driver, error) {
-	log.WithFields(log.Fields{
-		"machineName": machineName,
-		"storePath":   storePath,
-		"caCert":      caCert,
-		"privateKey":  privateKey,
-	}).Debug("Instantiating OpenStack driver...")
-
-	return NewDerivedDriver(machineName, storePath, &GenericClient{}, caCert, privateKey)
+func NewDriver(hostName, storePath string) drivers.Driver {
+	return NewDerivedDriver(hostName, storePath)
 }
 
-func NewDerivedDriver(machineName string, storePath string, client Client, caCert string, privateKey string) (*Driver, error) {
-	inner := drivers.NewBaseDriver(machineName, storePath, caCert, privateKey)
-	return &Driver{BaseDriver: inner, client: client}, nil
+func NewDerivedDriver(hostName, storePath string) *Driver {
+	return &Driver{
+		client:        &GenericClient{},
+		ActiveTimeout: defaultActiveTimeout,
+		BaseDriver: &drivers.BaseDriver{
+			SSHUser:     defaultSSHUser,
+			SSHPort:     defaultSSHPort,
+			MachineName: hostName,
+			StorePath:   storePath,
+		},
+	}
 }
 
 func (d *Driver) GetSSHHostname() (string, error) {
@@ -310,7 +316,7 @@ func (d *Driver) PreCreateCheck() error {
 }
 
 func (d *Driver) Create() error {
-	d.KeyPairName = fmt.Sprintf("%s-%s", d.MachineName, utils.GenerateRandomID())
+	d.KeyPairName = fmt.Sprintf("%s-%s", d.MachineName, mcnutils.GenerateRandomID())
 
 	if err := d.resolveIds(); err != nil {
 		return err
diff --git a/drivers/openstack/openstack_test.go b/drivers/openstack/openstack_test.go
deleted file mode 100644
index a0d778c..0000000
--- a/drivers/openstack/openstack_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package openstack