diff --git a/Cargo.lock b/Cargo.lock
index e82c4051ef..3f3d84465f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2910,6 +2910,19 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
+[[package]]
+name = "pagebench"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "pageserver",
+ "rand 0.8.5",
+ "tokio",
+ "tracing",
+ "utils",
+]
+
 [[package]]
 name = "pagectl"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index d186970194..c25a0dade3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@ members = [
     "control_plane",
     "pageserver",
     "pageserver/ctl",
+    "pageserver/pagebench",
     "proxy",
     "safekeeper",
     "storage_broker",
diff --git a/pageserver/pagebench/Cargo.toml b/pageserver/pagebench/Cargo.toml
new file mode 100644
index 0000000000..ea2c1ff68d
--- /dev/null
+++ b/pageserver/pagebench/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "pagebench"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+rand.workspace = true
+tracing.workspace = true
+tokio.workspace = true
+
+pageserver = { path = ".." }
+utils = { path = "../../libs/utils/" }
diff --git a/pageserver/src/bin/getpage_bench_libpq.rs b/pageserver/pagebench/src/main.rs
similarity index 99%
rename from pageserver/src/bin/getpage_bench_libpq.rs
rename to pageserver/pagebench/src/main.rs
index d35d173349..970a023cca 100644
--- a/pageserver/src/bin/getpage_bench_libpq.rs
+++ b/pageserver/pagebench/src/main.rs
@@ -22,8 +22,6 @@ struct Args {
     mgmt_api_endpoint: String,
     #[clap(long, default_value = "postgres://postgres@localhost:64000")]
     page_service_connstring: String,
-    // tenant_id: String,
-    // timeline_id: String,
     #[clap(long)]
     num_tasks: usize,
     #[clap(long)]