diff --git a/.guppy/hakari.toml b/.guppy/hakari.toml
index 084e194b84..91ada89b41 100644
--- a/.guppy/hakari.toml
+++ b/.guppy/hakari.toml
@@ -19,3 +19,17 @@ platforms = [
 
 # Write out exact versions rather than a semver range. (Defaults to false.)
 # exact-versions = true
+
+# Don't search in these crates for dependencies, and don't have these crates depend on the
+# workspace-hack crate.
+#
+# Includes most bench- or test-only crates except for query_tests, as that crate is built often
+# and should share as many dependencies as possible.
+[traversal-excludes]
+workspace-members = [
+    "grpc-router",
+    "grpc-router-test-gen",
+    "iox_data_generator",
+    "mutable_batch_tests",
+    "server_benchmarks",
+]
diff --git a/Cargo.lock b/Cargo.lock
index a45bbc3200..14cd6d15b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1288,7 +1288,6 @@ dependencies = [
  "tonic",
  "tonic-build",
  "tonic-reflection",
- "workspace-hack",
 ]
 
 [[package]]
@@ -1300,7 +1299,6 @@ dependencies = [
  "prost-types",
  "tonic",
  "tonic-build",
- "workspace-hack",
 ]
 
 [[package]]
@@ -1781,7 +1779,6 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "uuid",
- "workspace-hack",
 ]
 
 [[package]]
@@ -2257,7 +2254,6 @@ dependencies = [
  "mutable_batch_lp",
  "mutable_batch_pb",
  "prost",
- "workspace-hack",
 ]
 
 [[package]]
@@ -3952,7 +3948,6 @@ dependencies = [
  "server",
  "test_helpers",
  "tokio",
- "workspace-hack",
 ]
 
 [[package]]
@@ -5073,7 +5068,6 @@ dependencies = [
  "cc",
  "chrono",
  "clap",
- "criterion",
  "either",
  "futures",
  "futures-channel",
@@ -5094,8 +5088,6 @@ dependencies = [
  "num-integer",
  "num-traits",
  "once_cell",
- "prost",
- "prost-types",
  "rand",
  "regex",
  "regex-automata",
diff --git a/grpc-router-test-gen/Cargo.toml b/grpc-router-test-gen/Cargo.toml
index 3df26d588b..f23a1591c1 100644
--- a/grpc-router-test-gen/Cargo.toml
+++ b/grpc-router-test-gen/Cargo.toml
@@ -9,7 +9,6 @@ description = "Protobuf used in test for the grpc-router crate; need to be in a
 tonic = "0.5"
 prost = "0.8"
 prost-types = "0.8"
-workspace-hack = { path = "../workspace-hack"}
 
 [build-dependencies]
 tonic-build = "0.5"
diff --git a/grpc-router/Cargo.toml b/grpc-router/Cargo.toml
index 8f22eae5bf..dd2375c007 100644
--- a/grpc-router/Cargo.toml
+++ b/grpc-router/Cargo.toml
@@ -18,7 +18,6 @@ tokio-stream = { version = "0.1.8", features = ["net"] }
 tokio-util = { version = "0.6.9" }
 tonic = "0.5"
 tonic-reflection = "0.2.0"
-workspace-hack = { path = "../workspace-hack"}
 
 [build-dependencies]
 paste = "1.0.6"
diff --git a/iox_data_generator/Cargo.toml b/iox_data_generator/Cargo.toml
index 73234341a1..5ed7c30bda 100644
--- a/iox_data_generator/Cargo.toml
+++ b/iox_data_generator/Cargo.toml
@@ -26,7 +26,6 @@ toml = "0.5.6"
 tracing = "0.1"
 tracing-subscriber = "0.3.1"
 uuid = { version = "0.8.1", default_features = false }
-workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
 criterion = "0.3.3"
diff --git a/mutable_batch_tests/Cargo.toml b/mutable_batch_tests/Cargo.toml
index 25581a09ca..79c274f30c 100644
--- a/mutable_batch_tests/Cargo.toml
+++ b/mutable_batch_tests/Cargo.toml
@@ -12,7 +12,6 @@ mutable_batch = { path = "../mutable_batch" }
 mutable_batch_lp = { path = "../mutable_batch_lp" }
 mutable_batch_pb = { path = "../mutable_batch_pb" }
 prost = "0.8"
-workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
 bytes = "1.0"
diff --git a/server_benchmarks/Cargo.toml b/server_benchmarks/Cargo.toml
index 63b78e9378..5e5c0c623a 100644
--- a/server_benchmarks/Cargo.toml
+++ b/server_benchmarks/Cargo.toml
@@ -8,7 +8,6 @@ description = "Server related bechmarks, grouped into their own crate to minimiz
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-workspace-hack = { path = "../workspace-hack"}
 
 
 [dev-dependencies] # In alphabetical order
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index c81c00b9e8..00f805c355 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -18,7 +18,6 @@ bytes = { version = "1", features = ["std"] }
 cache_loader_async = { version = "0.1", features = ["ttl-cache"] }
 chrono = { version = "0.4", features = ["clock", "libc", "oldtime", "serde", "std", "time", "winapi"] }
 clap = { version = "2", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
-criterion = { version = "0.3", features = ["async", "async_tokio", "cargo_bench_support", "futures", "tokio"] }
 either = { version = "1", features = ["use_std"] }
 futures = { version = "0.3", features = ["alloc", "async-await", "executor", "futures-executor", "std"] }
 futures-channel = { version = "0.3", features = ["alloc", "futures-sink", "sink", "std"] }
@@ -39,8 +38,6 @@ num-bigint = { version = "0.4", features = ["std"] }
 num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] }
 num-traits = { version = "0.2", features = ["i128", "libm", "std"] }
 once_cell = { version = "1", features = ["alloc", "parking_lot", "race", "std"] }
-prost = { version = "0.8", features = ["prost-derive", "std"] }
-prost-types = { version = "0.8", features = ["std"] }
 rand = { version = "0.8", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] }
 regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
 regex-automata = { version = "0.1", features = ["regex-syntax", "std"] }
@@ -73,8 +70,6 @@ indexmap = { version = "1", default-features = false, features = ["std"] }
 libc = { version = "0.2", features = ["extra_traits", "std"] }
 log = { version = "0.4", default-features = false, features = ["std"] }
 memchr = { version = "2", features = ["std", "use_std"] }
-prost = { version = "0.8", features = ["prost-derive", "std"] }
-prost-types = { version = "0.8", features = ["std"] }
 rand = { version = "0.8", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] }
 regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
 regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }