diff --git a/cmd/apiserver/apiserver.go b/cmd/apiserver/apiserver.go
index 6d9b848e6a1..5c0b13beb11 100644
--- a/cmd/apiserver/apiserver.go
+++ b/cmd/apiserver/apiserver.go
@@ -29,6 +29,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/gce"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/vagrant"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	verflag "github.com/GoogleCloudPlatform/kubernetes/pkg/version/flag"
@@ -86,7 +87,7 @@ func main() {
 		}
 	case "vagrant":
 		var err error
-		cloud, err = cloudprovider.NewVagrantCloud()
+		cloud, err = vagrant_cloud.NewVagrantCloud()
 		if err != nil {
 			glog.Fatalf("Couldn't connect to vagrant cloud: %#v", err)
 		}
diff --git a/pkg/cloudprovider/vagrant.go b/pkg/cloudprovider/vagrant/vagrant.go
similarity index 94%
rename from pkg/cloudprovider/vagrant.go
rename to pkg/cloudprovider/vagrant/vagrant.go
index 6488776a3ac..8b4acefbbe0 100644
--- a/pkg/cloudprovider/vagrant.go
+++ b/pkg/cloudprovider/vagrant/vagrant.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cloudprovider
+package vagrant_cloud
 
 import (
 	"encoding/json"
@@ -24,6 +24,8 @@ import (
 	"net/http"
 	neturl "net/url"
 	"sort"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
 )
 
 // VagrantCloud is an implementation of Interface, TCPLoadBalancer and Instances for developer managed Vagrant cluster
@@ -72,17 +74,17 @@ func NewVagrantCloud() (*VagrantCloud, error) {
 }
 
 // TCPLoadBalancer returns an implementation of TCPLoadBalancer for Vagrant cloud
-func (v *VagrantCloud) TCPLoadBalancer() (TCPLoadBalancer, bool) {
+func (v *VagrantCloud) TCPLoadBalancer() (cloudprovider.TCPLoadBalancer, bool) {
 	return nil, false
 }
 
 // Instances returns an implementation of Instances for Vagrant cloud
-func (v *VagrantCloud) Instances() (Instances, bool) {
+func (v *VagrantCloud) Instances() (cloudprovider.Instances, bool) {
 	return v, true
 }
 
 // Zones returns an implementation of Zones for Vagrant cloud
-func (v *VagrantCloud) Zones() (Zones, bool) {
+func (v *VagrantCloud) Zones() (cloudprovider.Zones, bool) {
 	return nil, false
 }
 
diff --git a/pkg/cloudprovider/vagrant_test.go b/pkg/cloudprovider/vagrant/vagrant_test.go
similarity index 99%
rename from pkg/cloudprovider/vagrant_test.go
rename to pkg/cloudprovider/vagrant/vagrant_test.go
index 0877f678379..e0c4c20d5ad 100644
--- a/pkg/cloudprovider/vagrant_test.go
+++ b/pkg/cloudprovider/vagrant/vagrant_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cloudprovider
+package vagrant_cloud
 
 import (
 	"net/http"