diff --git a/private_set_intersection/cpp/util/BUILD.bazel b/private_set_intersection/cpp/util/BUILD.bazel
index 17be5295..d594475d 100644
--- a/private_set_intersection/cpp/util/BUILD.bazel
+++ b/private_set_intersection/cpp/util/BUILD.bazel
@@ -20,9 +20,9 @@ cc_library(
     hdrs = ["status_matchers.h"],
     visibility = ["//visibility:public"],
     deps = [
+        "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:optional",
         "@com_google_googletest//:gtest",
-        "@com_google_absl//absl/status:statusor",
     ],
 )
diff --git a/private_set_intersection/go/client/BUILD b/private_set_intersection/go/client/BUILD
index 9869990d..015bbb03 100644
--- a/private_set_intersection/go/client/BUILD
+++ b/private_set_intersection/go/client/BUILD
@@ -8,7 +8,6 @@ go_library(
     importpath = "github.com/openmined/psi/client",
     visibility = ["//visibility:public"],
     deps = [
-        "//private_set_intersection/go/datastructure",
         "//private_set_intersection/go/version",
         "//private_set_intersection/proto:psi_go_proto",
         "@org_golang_google_protobuf//proto:go_default_library",
@@ -19,9 +18,5 @@ go_test(
     name = "client_test",
     srcs = ["client_test.go"],
     embed = [":client"],
-    deps = [
-        "//private_set_intersection/go/server",
-        "//private_set_intersection/proto:psi_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
-    ],
+    deps = ["//private_set_intersection/proto:psi_go_proto"],
 )
diff --git a/private_set_intersection/go/server/BUILD b/private_set_intersection/go/server/BUILD
index 42c43632..5f79a62c 100644
--- a/private_set_intersection/go/server/BUILD
+++ b/private_set_intersection/go/server/BUILD
@@ -21,7 +21,7 @@ go_test(
     embed = [":server"],
     deps = [
         "//private_set_intersection/go/client",
+        "//private_set_intersection/go/datastructure",
         "//private_set_intersection/proto:psi_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
     ],
 )
diff --git a/private_set_intersection/proto/BUILD b/private_set_intersection/proto/BUILD
index 3ab507e2..d4c9eb38 100644
--- a/private_set_intersection/proto/BUILD
+++ b/private_set_intersection/proto/BUILD
@@ -1,3 +1,5 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
 #
 # Copyright 2020 the authors listed in CONTRIBUTORS.md
 #
@@ -47,3 +49,15 @@ python_proto_library(
     name = "psi_python_proto",
     protos = [":psi_proto"],
 )
+
+go_proto_library(
+    name = "psi_proto_go_proto",
+    importpath = "private_set_intersection/proto",
+    proto = ":psi_proto",
+)
+
+go_library(
+    name = "proto",
+    embed = [":psi_proto_go_proto"],
+    importpath = "private_set_intersection/proto",
+)