diff --git a/pkg/minikube/cluster/cluster_linux.go b/pkg/minikube/cluster/cluster_linux.go
index 870f5dcd9e..061fb52c66 100644
--- a/pkg/minikube/cluster/cluster_linux.go
+++ b/pkg/minikube/cluster/cluster_linux.go
@@ -24,7 +24,7 @@ import (
 	"github.com/docker/machine/libmachine/drivers"
 	cfg "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
-	pkgDrivers "k8s.io/minikube/pkg/minikube/machine/drivers"
+	"k8s.io/minikube/pkg/minikube/machine/drivers/none"
 )
 
 type kvmDriver struct {
@@ -69,8 +69,8 @@ func detectVBoxManageCmd() string {
 	return cmd
 }
 
-func createNoneHost(config MachineConfig) *pkgDrivers.Driver {
-	return &pkgDrivers.Driver{
+func createNoneHost(config MachineConfig) *none.Driver {
+	return &none.Driver{
 		BaseDriver: &drivers.BaseDriver{
 			MachineName: cfg.GetMachineName(),
 			StorePath:   constants.GetMinipath(),
diff --git a/pkg/minikube/machine/client_linux.go b/pkg/minikube/machine/client_linux.go
index a9ac420d45..b32e730c07 100644
--- a/pkg/minikube/machine/client_linux.go
+++ b/pkg/minikube/machine/client_linux.go
@@ -24,7 +24,7 @@ import (
 	"github.com/docker/machine/libmachine/drivers/plugin"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	pkgDrivers "k8s.io/minikube/pkg/minikube/machine/drivers"
+	"k8s.io/minikube/pkg/minikube/machine/drivers/none"
 )
 
 var driverMap = map[string]driverGetter{
@@ -42,7 +42,7 @@ https://github.com/kubernetes/minikube/blob/master/DRIVERS.md#kvm-driver
 
 func getNoneDriver(rawDriver []byte) (drivers.Driver, error) {
 	var driver drivers.Driver
-	driver = &pkgDrivers.Driver{}
+	driver = &none.Driver{}
 	if err := json.Unmarshal(rawDriver, &driver); err != nil {
 		return nil, errors.Wrap(err, "Error unmarshalling none driver")
 	}
@@ -55,7 +55,7 @@ func registerDriver(driverName string) {
 	case "virtualbox":
 		plugin.RegisterDriver(virtualbox.NewDriver("", ""))
 	case "none":
-		plugin.RegisterDriver(pkgDrivers.NewDriver("", ""))
+		plugin.RegisterDriver(none.NewDriver("", ""))
 	default:
 		glog.Exitf("Unsupported driver: %s\n", driverName)
 	}
diff --git a/pkg/minikube/machine/drivers/none-driver.go b/pkg/minikube/machine/drivers/none/none.go
similarity index 99%
rename from pkg/minikube/machine/drivers/none-driver.go
rename to pkg/minikube/machine/drivers/none/none.go
index d9d74735c8..f7455f570a 100644
--- a/pkg/minikube/machine/drivers/none-driver.go
+++ b/pkg/minikube/machine/drivers/none/none.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package drivers
+package none
 
 import (
 	"errors"