diff --git a/pkg/storage/etcd/api_object_versioner_test.go b/pkg/storage/etcd/api_object_versioner_test.go
index acbce6243..6ed59dfc3 100644
--- a/pkg/storage/etcd/api_object_versioner_test.go
+++ b/pkg/storage/etcd/api_object_versioner_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	storagetesting "k8s.io/kubernetes/pkg/storage/testing"
+	storagetesting "k8s.io/apiserver/pkg/storage/testing"
 )
 
 func TestObjectVersioner(t *testing.T) {
diff --git a/pkg/storage/etcd/doc.go b/pkg/storage/etcd/doc.go
index 22b269d5a..566f46651 100644
--- a/pkg/storage/etcd/doc.go
+++ b/pkg/storage/etcd/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package etcd // import "k8s.io/kubernetes/pkg/storage/etcd"
+package etcd // import "k8s.io/apiserver/pkg/storage/etcd"
diff --git a/pkg/storage/etcd/etcd_helper.go b/pkg/storage/etcd/etcd_helper.go
index 08944b0c0..13a54b38b 100644
--- a/pkg/storage/etcd/etcd_helper.go
+++ b/pkg/storage/etcd/etcd_helper.go
@@ -36,7 +36,7 @@ import (
 	"k8s.io/apiserver/pkg/storage/etcd/metrics"
 	utilcache "k8s.io/apiserver/pkg/util/cache"
 	utiltrace "k8s.io/apiserver/pkg/util/trace"
-	etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util"
+	etcdutil "k8s.io/apiserver/pkg/storage/etcd/util"
 )
 
 // Creates a new storage interface from the client
diff --git a/pkg/storage/etcd/etcd_helper_test.go b/pkg/storage/etcd/etcd_helper_test.go
index e2793f0ab..1d7f52535 100644
--- a/pkg/storage/etcd/etcd_helper_test.go
+++ b/pkg/storage/etcd/etcd_helper_test.go
@@ -36,10 +36,10 @@ import (
 	"k8s.io/apiserver/pkg/apis/example"
 	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
 	"k8s.io/apiserver/pkg/storage"
-	"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
-	etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
-	storagetesting "k8s.io/kubernetes/pkg/storage/testing"
-	storagetests "k8s.io/kubernetes/pkg/storage/tests"
+	"k8s.io/apiserver/pkg/storage/etcd/etcdtest"
+	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
+	storagetesting "k8s.io/apiserver/pkg/storage/testing"
+	storagetests "k8s.io/apiserver/pkg/storage/tests"
 )
 
 func testScheme(t *testing.T) (*runtime.Scheme, serializer.CodecFactory) {
diff --git a/pkg/storage/etcd/etcd_watcher.go b/pkg/storage/etcd/etcd_watcher.go
index 280ecb657..a1fb30527 100644
--- a/pkg/storage/etcd/etcd_watcher.go
+++ b/pkg/storage/etcd/etcd_watcher.go
@@ -28,7 +28,7 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/apiserver/pkg/storage"
-	etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util"
+	etcdutil "k8s.io/apiserver/pkg/storage/etcd/util"
 
 	etcd "github.com/coreos/etcd/client"
 	"github.com/golang/glog"
diff --git a/pkg/storage/etcd/etcd_watcher_test.go b/pkg/storage/etcd/etcd_watcher_test.go
index cfdb5a7ab..b296c1494 100644
--- a/pkg/storage/etcd/etcd_watcher_test.go
+++ b/pkg/storage/etcd/etcd_watcher_test.go
@@ -29,8 +29,8 @@ import (
 	"k8s.io/apiserver/pkg/apis/example"
 	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
 	"k8s.io/apiserver/pkg/storage"
-	"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
-	etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
+	"k8s.io/apiserver/pkg/storage/etcd/etcdtest"
+	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
 
 	etcd "github.com/coreos/etcd/client"
 	"golang.org/x/net/context"
diff --git a/pkg/storage/etcd/etcdtest/doc.go b/pkg/storage/etcd/etcdtest/doc.go
index 23f749e5e..d86e088d2 100644
--- a/pkg/storage/etcd/etcdtest/doc.go
+++ b/pkg/storage/etcd/etcdtest/doc.go
@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package etcdtest // import "k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
+package etcdtest // import "k8s.io/apiserver/pkg/storage/etcd/etcdtest"
diff --git a/pkg/storage/etcd/testing/utils.go b/pkg/storage/etcd/testing/utils.go
index 9e570243d..832de06d1 100644
--- a/pkg/storage/etcd/testing/utils.go
+++ b/pkg/storage/etcd/testing/utils.go
@@ -30,8 +30,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
-	"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
-	"k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert"
+	"k8s.io/apiserver/pkg/storage/etcd/etcdtest"
+	"k8s.io/apiserver/pkg/storage/etcd/testing/testingcert"
 
 	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/clientv3"
diff --git a/pkg/storage/etcd/util/doc.go b/pkg/storage/etcd/util/doc.go
index d10b9a992..97241a44f 100644
--- a/pkg/storage/etcd/util/doc.go
+++ b/pkg/storage/etcd/util/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package util holds generic etcd-related utility functions that any user of ectd might want to
 // use, without pulling in kubernetes-specific code.
-package util // import "k8s.io/kubernetes/pkg/storage/etcd/util"
+package util // import "k8s.io/apiserver/pkg/storage/etcd/util"
diff --git a/pkg/storage/etcd3/store.go b/pkg/storage/etcd3/store.go
index be7a00d46..e55c646b0 100644
--- a/pkg/storage/etcd3/store.go
+++ b/pkg/storage/etcd3/store.go
@@ -36,7 +36,7 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/apiserver/pkg/storage"
 	utiltrace "k8s.io/apiserver/pkg/util/trace"
-	"k8s.io/kubernetes/pkg/storage/etcd"
+	"k8s.io/apiserver/pkg/storage/etcd"
 )
 
 type store struct {
diff --git a/pkg/storage/storagebackend/factory/etcd2.go b/pkg/storage/storagebackend/factory/etcd2.go
index c6e5f52c4..78377c493 100644
--- a/pkg/storage/storagebackend/factory/etcd2.go
+++ b/pkg/storage/storagebackend/factory/etcd2.go
@@ -27,7 +27,7 @@ import (
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apiserver/pkg/storage"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
-	"k8s.io/kubernetes/pkg/storage/etcd"
+	"k8s.io/apiserver/pkg/storage/etcd"
 )
 
 func newETCD2Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) {
diff --git a/pkg/storage/storagebackend/factory/etcd3.go b/pkg/storage/storagebackend/factory/etcd3.go
index 595474723..fa457719e 100644
--- a/pkg/storage/storagebackend/factory/etcd3.go
+++ b/pkg/storage/storagebackend/factory/etcd3.go
@@ -19,7 +19,7 @@ package factory
 import (
 	"k8s.io/apiserver/pkg/storage"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
-	"k8s.io/kubernetes/pkg/storage/etcd3"
+	"k8s.io/apiserver/pkg/storage/etcd3"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/pkg/transport"
diff --git a/pkg/storage/storagebackend/factory/tls_test.go b/pkg/storage/storagebackend/factory/tls_test.go
index b13a944e2..294642eeb 100644
--- a/pkg/storage/storagebackend/factory/tls_test.go
+++ b/pkg/storage/storagebackend/factory/tls_test.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/apiserver/pkg/apis/example"
 	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
-	"k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert"
+	"k8s.io/apiserver/pkg/storage/etcd/testing/testingcert"
 )
 
 var scheme = runtime.NewScheme()
diff --git a/pkg/storage/tests/cacher_test.go b/pkg/storage/tests/cacher_test.go
index 7cebc6e07..d3690c422 100644
--- a/pkg/storage/tests/cacher_test.go
+++ b/pkg/storage/tests/cacher_test.go
@@ -38,10 +38,10 @@ import (
 	"k8s.io/apiserver/pkg/apis/example"
 	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
 	"k8s.io/apiserver/pkg/storage"
-	etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
-	"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
-	etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
-	"k8s.io/kubernetes/pkg/storage/etcd3"
+	etcdstorage "k8s.io/apiserver/pkg/storage/etcd"
+	"k8s.io/apiserver/pkg/storage/etcd/etcdtest"
+	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
+	"k8s.io/apiserver/pkg/storage/etcd3"
 
 	"golang.org/x/net/context"