diff --git a/main.go b/main.go
index c52a1b53f..aee7fa821 100644
--- a/main.go
+++ b/main.go
@@ -16,11 +16,11 @@ import (
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/etcdhttp"
 	"github.com/coreos/etcd/pkg"
+	"github.com/coreos/etcd/pkg/transport"
 	"github.com/coreos/etcd/proxy"
 	"github.com/coreos/etcd/raft"
 	"github.com/coreos/etcd/snap"
 	"github.com/coreos/etcd/store"
-	"github.com/coreos/etcd/transport"
 	"github.com/coreos/etcd/wal"
 )
 
diff --git a/transport/listener.go b/pkg/transport/listener.go
similarity index 100%
rename from transport/listener.go
rename to pkg/transport/listener.go
diff --git a/transport/listener_test.go b/pkg/transport/listener_test.go
similarity index 100%
rename from transport/listener_test.go
rename to pkg/transport/listener_test.go
diff --git a/test b/test
index 76412f8b7..650db4e85 100755
--- a/test
+++ b/test
@@ -15,7 +15,7 @@ COVER=${COVER:-"-cover"}
 source ./build
 
 # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt.
-TESTABLE_AND_FORMATTABLE="client etcdserver etcdserver/etcdhttp etcdserver/etcdserverpb functional pkg proxy raft snap store transport wait wal"
+TESTABLE_AND_FORMATTABLE="client etcdserver etcdserver/etcdhttp etcdserver/etcdserverpb functional pkg pkg/transport proxy raft snap store wait wal"
 TESTABLE="$TESTABLE_AND_FORMATTABLE ./"
 FORMATTABLE="$TESTABLE_AND_FORMATTABLE *.go"