diff --git a/go/cmd/vtgateclienttest/gorpcclienttest/gorpc_goclient_test.go b/go/cmd/vtgateclienttest/gorpcclienttest/gorpc_goclient_test.go
index c17816133f..eae89bf9db 100644
--- a/go/cmd/vtgateclienttest/gorpcclienttest/gorpc_goclient_test.go
+++ b/go/cmd/vtgateclienttest/gorpcclienttest/gorpc_goclient_test.go
@@ -14,9 +14,6 @@ import (
 	"github.com/youtube/vitess/go/rpcplus"
 	"github.com/youtube/vitess/go/rpcwrap/bsonrpc"
 	"github.com/youtube/vitess/go/vt/vtgate/gorpcvtgateservice"
-
-	// import the gorpc client, it will register itself
-	_ "github.com/youtube/vitess/go/vt/vtgate/gorpcvtgateconn"
 )
 
 // TestGoRPCGoClient tests the go client using goRPC
diff --git a/go/cmd/vtgateclienttest/gorpcclienttest/import.go b/go/cmd/vtgateclienttest/gorpcclienttest/import.go
new file mode 100644
index 0000000000..374a14e593
--- /dev/null
+++ b/go/cmd/vtgateclienttest/gorpcclienttest/import.go
@@ -0,0 +1,10 @@
+// Copyright 2015 Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package gorpcclienttest
+
+import (
+	// import the gorpc client, it will register itself
+	_ "github.com/youtube/vitess/go/vt/vtgate/gorpcvtgateconn"
+)
diff --git a/go/cmd/vtgateclienttest/grpcclienttest/grpc_goclient_test.go b/go/cmd/vtgateclienttest/grpcclienttest/grpc_goclient_test.go
index c853f2f324..3d6dd7e5f3 100644
--- a/go/cmd/vtgateclienttest/grpcclienttest/grpc_goclient_test.go
+++ b/go/cmd/vtgateclienttest/grpcclienttest/grpc_goclient_test.go
@@ -13,9 +13,6 @@ import (
 	"github.com/youtube/vitess/go/cmd/vtgateclienttest/goclienttest"
 	"github.com/youtube/vitess/go/cmd/vtgateclienttest/services"
 	"github.com/youtube/vitess/go/vt/vtgate/grpcvtgateservice"
-
-	// import the grpc client, it will register itself
-	_ "github.com/youtube/vitess/go/vt/vtgate/grpcvtgateconn"
 )
 
 // TestGRPCGoClient tests the go client using gRPC
diff --git a/go/cmd/vtgateclienttest/grpcclienttest/import.go b/go/cmd/vtgateclienttest/grpcclienttest/import.go
new file mode 100644
index 0000000000..b07cadb6c9
--- /dev/null
+++ b/go/cmd/vtgateclienttest/grpcclienttest/import.go
@@ -0,0 +1,10 @@
+// Copyright 2015 Google Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package grpcclienttest
+
+import (
+	// import the grpc client, it will register itself
+	_ "github.com/youtube/vitess/go/vt/vtgate/grpcvtgateconn"
+)