diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index a4658307c3c..1ff7178e9d8 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -115,8 +115,9 @@ jobs:
         fi
 
         mkdir benchmark && cd benchmark
-        ../source/tests/benchmarks/benchmark.sh \
+        ../source/benchmarks/cli/benchmark.sh \
             ${SUITE_FLAG} ${DEBUG_FLAG} \
+            --admin \
             --baseline-cli "git" --cli "${GIT2_CLI}" --name libgit2 \
             --json benchmarks.json --flamegraph --zip benchmarks.zip
       shell: bash
diff --git a/tests/benchmarks/README.md b/benchmarks/cli/README.md
similarity index 100%
rename from tests/benchmarks/README.md
rename to benchmarks/cli/README.md
diff --git a/tests/benchmarks/_script/flamegraph/README.md b/benchmarks/cli/_script/flamegraph/README.md
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/README.md
rename to benchmarks/cli/_script/flamegraph/README.md
diff --git a/tests/benchmarks/_script/flamegraph/aix-perf.pl b/benchmarks/cli/_script/flamegraph/aix-perf.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/aix-perf.pl
rename to benchmarks/cli/_script/flamegraph/aix-perf.pl
diff --git a/tests/benchmarks/_script/flamegraph/difffolded.pl b/benchmarks/cli/_script/flamegraph/difffolded.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/difffolded.pl
rename to benchmarks/cli/_script/flamegraph/difffolded.pl
diff --git a/tests/benchmarks/_script/flamegraph/example-dtrace-stacks.txt b/benchmarks/cli/_script/flamegraph/example-dtrace-stacks.txt
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/example-dtrace-stacks.txt
rename to benchmarks/cli/_script/flamegraph/example-dtrace-stacks.txt
diff --git a/tests/benchmarks/_script/flamegraph/example-dtrace.svg b/benchmarks/cli/_script/flamegraph/example-dtrace.svg
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/example-dtrace.svg
rename to benchmarks/cli/_script/flamegraph/example-dtrace.svg
diff --git a/tests/benchmarks/_script/flamegraph/example-perf-stacks.txt.gz b/benchmarks/cli/_script/flamegraph/example-perf-stacks.txt.gz
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/example-perf-stacks.txt.gz
rename to benchmarks/cli/_script/flamegraph/example-perf-stacks.txt.gz
diff --git a/tests/benchmarks/_script/flamegraph/example-perf.svg b/benchmarks/cli/_script/flamegraph/example-perf.svg
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/example-perf.svg
rename to benchmarks/cli/_script/flamegraph/example-perf.svg
diff --git a/tests/benchmarks/_script/flamegraph/files.pl b/benchmarks/cli/_script/flamegraph/files.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/files.pl
rename to benchmarks/cli/_script/flamegraph/files.pl
diff --git a/tests/benchmarks/_script/flamegraph/flamegraph.pl b/benchmarks/cli/_script/flamegraph/flamegraph.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/flamegraph.pl
rename to benchmarks/cli/_script/flamegraph/flamegraph.pl
diff --git a/tests/benchmarks/_script/flamegraph/jmaps b/benchmarks/cli/_script/flamegraph/jmaps
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/jmaps
rename to benchmarks/cli/_script/flamegraph/jmaps
diff --git a/tests/benchmarks/_script/flamegraph/pkgsplit-perf.pl b/benchmarks/cli/_script/flamegraph/pkgsplit-perf.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/pkgsplit-perf.pl
rename to benchmarks/cli/_script/flamegraph/pkgsplit-perf.pl
diff --git a/tests/benchmarks/_script/flamegraph/range-perf.pl b/benchmarks/cli/_script/flamegraph/range-perf.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/range-perf.pl
rename to benchmarks/cli/_script/flamegraph/range-perf.pl
diff --git a/tests/benchmarks/_script/flamegraph/record-test.sh b/benchmarks/cli/_script/flamegraph/record-test.sh
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/record-test.sh
rename to benchmarks/cli/_script/flamegraph/record-test.sh
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-aix.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-aix.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-aix.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-aix.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-bpftrace.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-bpftrace.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-bpftrace.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-bpftrace.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-chrome-tracing.py b/benchmarks/cli/_script/flamegraph/stackcollapse-chrome-tracing.py
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-chrome-tracing.py
rename to benchmarks/cli/_script/flamegraph/stackcollapse-chrome-tracing.py
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-elfutils.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-elfutils.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-elfutils.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-elfutils.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-faulthandler.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-faulthandler.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-faulthandler.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-faulthandler.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-gdb.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-gdb.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-gdb.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-gdb.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-go.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-go.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-go.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-go.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-ibmjava.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-ibmjava.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-ibmjava.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-ibmjava.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-instruments.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-instruments.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-instruments.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-instruments.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-java-exceptions.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-java-exceptions.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-java-exceptions.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-java-exceptions.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-jstack.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-jstack.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-jstack.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-jstack.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-ljp.awk b/benchmarks/cli/_script/flamegraph/stackcollapse-ljp.awk
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-ljp.awk
rename to benchmarks/cli/_script/flamegraph/stackcollapse-ljp.awk
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-perf-sched.awk b/benchmarks/cli/_script/flamegraph/stackcollapse-perf-sched.awk
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-perf-sched.awk
rename to benchmarks/cli/_script/flamegraph/stackcollapse-perf-sched.awk
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-perf.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-perf.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-perf.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-perf.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-pmc.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-pmc.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-pmc.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-pmc.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-recursive.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-recursive.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-recursive.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-recursive.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-sample.awk b/benchmarks/cli/_script/flamegraph/stackcollapse-sample.awk
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-sample.awk
rename to benchmarks/cli/_script/flamegraph/stackcollapse-sample.awk
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-stap.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-stap.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-stap.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-stap.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-vsprof.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-vsprof.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-vsprof.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-vsprof.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-vtune-mc.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-vtune-mc.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-vtune-mc.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-vtune-mc.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-vtune.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-vtune.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-vtune.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-vtune.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-wcp.pl b/benchmarks/cli/_script/flamegraph/stackcollapse-wcp.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-wcp.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse-wcp.pl
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse-xdebug.php b/benchmarks/cli/_script/flamegraph/stackcollapse-xdebug.php
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse-xdebug.php
rename to benchmarks/cli/_script/flamegraph/stackcollapse-xdebug.php
diff --git a/tests/benchmarks/_script/flamegraph/stackcollapse.pl b/benchmarks/cli/_script/flamegraph/stackcollapse.pl
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/stackcollapse.pl
rename to benchmarks/cli/_script/flamegraph/stackcollapse.pl
diff --git a/tests/benchmarks/_script/flamegraph/test.sh b/benchmarks/cli/_script/flamegraph/test.sh
similarity index 100%
rename from tests/benchmarks/_script/flamegraph/test.sh
rename to benchmarks/cli/_script/flamegraph/test.sh
diff --git a/tests/benchmarks/benchmark.sh b/benchmarks/cli/benchmark.sh
similarity index 90%
rename from tests/benchmarks/benchmark.sh
rename to benchmarks/cli/benchmark.sh
index e82eaabfad1..34728c6a283 100755
--- a/tests/benchmarks/benchmark.sh
+++ b/benchmarks/cli/benchmark.sh
@@ -6,7 +6,7 @@ set -eo pipefail
 # parse the command line
 #
 
-usage() { echo "usage: $(basename "$0") [--cli <path>] [--name <cli-name>] [--baseline-cli <path>] [--suite <suite>] [--json <path>] [--flamegraph] [--zip <path>] [--verbose] [--debug]"; }
+usage() { echo "usage: $(basename "$0") [--cli <path>] [--name <cli-name>] [--baseline-cli <path>] [--suite <suite>] [--admin] [--json <path>] [--flamegraph] [--zip <path>] [--verbose] [--debug]"; }
 
 TEST_CLI="git"
 TEST_CLI_NAME=
@@ -16,6 +16,7 @@ JSON_RESULT=
 FLAMEGRAPH=
 ZIP_RESULT=
 OUTPUT_DIR=
+ADMIN=
 VERBOSE=
 DEBUG=
 NEXT=
@@ -58,6 +59,8 @@ for a in "$@"; do
 		NEXT="suite"
 	elif [[ "${a}" == "-s"* ]]; then
 		SUITE="${a/-s/}"
+	elif [ "${a}" == "--admin" ]; then
+		ADMIN=1
 	elif [ "${a}" = "-v" ] || [ "${a}" == "--verbose" ]; then
 		VERBOSE=1
 	elif [ "${a}" == "--debug" ]; then
@@ -126,7 +129,7 @@ cli_commit() {
 		BUILD_OPTIONS=$("$1" version --build-options)
 	fi
 
-	echo "${BUILD_OPTIONS}" | grep '^built from commit: ' | sed -e 's/^built from commit: //'
+	echo "${BUILD_OPTIONS}" | { grep '^built from commit: ' || echo "unknown"; } | sed -e 's/^built from commit: //'
 }
 
 TEST_CLI_NAME=$(basename "${TEST_CLI}")
@@ -162,9 +165,9 @@ echo "##########################################################################
 echo ""
 
 if [ "${BASELINE_CLI}" != "" ]; then
-	echo "# Baseline CLI: ${BASELINE_CLI} (${BASELINE_CLI_VERSION})"
+	echo "# Baseline CLI: ${BASELINE_CLI} (${BASELINE_CLI_VERSION} ${BASELINE_CLI_COMMIT:0:7})"
 fi
-echo "# Test CLI: ${TEST_CLI} (${TEST_CLI_VERSION})"
+echo "# Test CLI: ${TEST_CLI} (${TEST_CLI_VERSION} ${TEST_CLI_COMMIT:0:7})"
 echo ""
 
 BENCHMARK_DIR=${BENCHMARK_DIR:=$(dirname "$0")}
@@ -209,6 +212,8 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 		continue
 	fi
 
+	TEST_DESCRIPTION=$(( grep '^# Description: ' "${TEST_PATH}" || test $? = 1 ) | sed -e "s/^# Description: //")
+
 	ANY_FOUND=1
 	TEST_NAME="${TEST_FILE/__/::}"
 
@@ -223,6 +228,10 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 		SHOW_OUTPUT="--show-output"
 	fi
 
+	if [ "${ADMIN}" = "1" ]; then
+		ALLOW_ADMIN="--admin"
+	fi
+
 	OUTPUT_FILE="${OUTPUT_DIR}/${TEST_FILE}.out"
 	ERROR_FILE="${OUTPUT_DIR}/${TEST_FILE}.err"
 	JSON_FILE="${OUTPUT_DIR}/${TEST_FILE}.json"
@@ -230,7 +239,7 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 
 	FAILED=
 	{
-	  ${TEST_PATH} --cli "${TEST_CLI}" --baseline-cli "${BASELINE_CLI}" --json "${JSON_FILE}" ${SHOW_OUTPUT} >"${OUTPUT_FILE}" 2>"${ERROR_FILE}";
+	  ${TEST_PATH} --cli "${TEST_CLI}" --baseline-cli "${BASELINE_CLI}" --json "${JSON_FILE}" ${ALLOW_ADMIN} ${SHOW_OUTPUT} >"${OUTPUT_FILE}" 2>"${ERROR_FILE}";
 	  FAILED=$?
 	} || true
 
@@ -272,7 +281,7 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 	fi
 
 	# add our metadata to the hyperfine json result
-	jq ". |= { \"name\": \"${TEST_NAME}\" } + ." < "${JSON_FILE}" > "${JSON_FILE}.new" && mv "${JSON_FILE}.new" "${JSON_FILE}"
+	jq ". |= { \"name\": \"${TEST_NAME}\", \"description\": \"${TEST_DESCRIPTION}\" } + ." < "${JSON_FILE}" > "${JSON_FILE}.new" && mv "${JSON_FILE}.new" "${JSON_FILE}"
 
 	# run with flamegraph output if requested
 	if [ "${FLAMEGRAPH}" ]; then
@@ -311,6 +320,8 @@ for TEST_PATH in "${BENCHMARK_DIR}"/*; do
 				ANY_FAILED=1
 			fi
 		fi
+	else
+		echo ""
 	fi
 done
 
diff --git a/tests/benchmarks/benchmark_helpers.sh b/benchmarks/cli/benchmark_helpers.sh
similarity index 93%
rename from tests/benchmarks/benchmark_helpers.sh
rename to benchmarks/cli/benchmark_helpers.sh
index e5babf9c819..f78aabc09f8 100644
--- a/tests/benchmarks/benchmark_helpers.sh
+++ b/benchmarks/cli/benchmark_helpers.sh
@@ -7,11 +7,12 @@ set -eo pipefail
 # command-line parsing
 #
 
-usage() { echo "usage: $(basename "$0") [--cli <path>] [--baseline-cli <path>] [--output-style <style>] [--json <path>] [--profile] [--flamegraph <path>]"; }
+usage() { echo "usage: $(basename "$0") [--cli <path>] [--baseline-cli <path>] [--admin] [--output-style <style>] [--json <path>] [--show-output] [--output-style <style>] [--profile] [--flamegraph <path>]"; }
 
 NEXT=
 BASELINE_CLI=
 TEST_CLI="git"
+ADMIN=
 SHOW_OUTPUT=
 JSON=
 PROFILE=
@@ -69,6 +70,8 @@ for a in "$@"; do
                 JSON="${a/-j/}"
 	elif [ "${a}" = "-p" ] || [ "${a}" = "--profile" ]; then
 		PROFILE=1
+	elif [ "${a}" = "--admin" ]; then
+		ADMIN=1
 	elif [ "${a}" = "-F" ] || [ "${a}" = "--flamegraph" ]; then
 		NEXT="flamegraph"
 	elif [[ "${a}" == "-F"* ]]; then
@@ -102,7 +105,7 @@ fullpath() {
 }
 
 resources_dir() {
-	cd "$(dirname "$0")/../resources" && pwd
+	cd "$(dirname "$0")/../../tests/resources" && pwd
 }
 
 temp_dir() {
@@ -335,6 +338,9 @@ parse_arguments() {
 	# this test should run `n` warmups
 	WARMUP=0
 
+	# this test requires administrative privileges
+	REQUIRES_ADMIN=0
+
 	if [ "$*" = "" ]; then
 		gitbench_usage 1>&2
 		exit 1
@@ -356,6 +362,8 @@ parse_arguments() {
 			NEXT="prepare"
 		elif [ "${a}" = "--chdir" ]; then
 			NEXT="chdir"
+		elif [ "${a}" = "--requires-admin" ]; then
+			REQUIRES_ADMIN=1
 		elif [[ "${a}" == "--" ]]; then
 			shift
 			break
@@ -379,6 +387,7 @@ parse_arguments() {
 	echo "PREPARE=\"${PREPARE}\""
 	echo "CHDIR=\"${CHDIR}\""
 	echo "WARMUP=\"${WARMUP}\""
+	echo "REQUIRES_ADMIN=\"${REQUIRES_ADMIN}\""
 
 	echo -n "GIT_ARGUMENTS=("
 
@@ -388,7 +397,7 @@ parse_arguments() {
 	echo " )"
 }
 
-gitbench_usage() { echo "usage: gitbench command..."; }
+gitbench_usage() { echo "usage: gitbench [--requires-admin] [--warmup <count>] [--prepare <command>] [--chdir <directory>] command..."; }
 
 exec_profiler() {
 	if [ "${BASELINE_CLI}" != "" ]; then
@@ -490,7 +499,8 @@ exec_hyperfine() {
 # invocation of hyperfine.
 #
 gitbench() {
-	eval $(parse_arguments "$@")
+	argument_data=$(parse_arguments "$@")
+	eval ${argument_data}
 
 	# sanity check
 
@@ -515,6 +525,17 @@ gitbench() {
 #	rm -rf "${SANDBOX_DIR:?}"
 }
 
+# helper script to ensure that --admin is specified
+needs_admin() {
+	if [ "${ADMIN}" != "1" ]; then
+		echo "$0: skipping administrator test" 1>&2
+		echo "" 1>&2
+		echo "This benchmark needs administrative (root) privileges. To run it," 1>&2
+		echo "specify '--admin' to the benchmark." 1>&2
+		exit 2
+	fi
+}
+
 # helper script to give useful error messages about configuration
 needs_repo() {
 	REPO="${1}"
diff --git a/tests/benchmarks/blame__git_cached b/benchmarks/cli/blame__git
similarity index 81%
rename from tests/benchmarks/blame__git_cached
rename to benchmarks/cli/blame__git
index 1664f737b90..a4c7700417a 100755
--- a/tests/benchmarks/blame__git_cached
+++ b/benchmarks/cli/blame__git
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: blame a file in the core git repository
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/tests/benchmarks/blame__linux_cached b/benchmarks/cli/blame__linux
similarity index 82%
rename from tests/benchmarks/blame__linux_cached
rename to benchmarks/cli/blame__linux
index 20c5db5bbe5..a8078e3505f 100755
--- a/tests/benchmarks/blame__linux_cached
+++ b/benchmarks/cli/blame__linux
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: blame a file in the linux repository
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/tests/benchmarks/blame__simple_cached b/benchmarks/cli/blame__simple
similarity index 80%
rename from tests/benchmarks/blame__simple_cached
rename to benchmarks/cli/blame__simple
index f13e2cb060f..c71c0d3519c 100755
--- a/tests/benchmarks/blame__simple_cached
+++ b/benchmarks/cli/blame__simple
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: blame a simple file in the test repository
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/tests/benchmarks/hash-object__text_cached_100kb b/benchmarks/cli/hash-object__text_100kb
similarity index 81%
rename from tests/benchmarks/hash-object__text_cached_100kb
rename to benchmarks/cli/hash-object__text_100kb
index 7c2a84125ae..c60126631b2 100755
--- a/tests/benchmarks/hash-object__text_cached_100kb
+++ b/benchmarks/cli/hash-object__text_100kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: hash a 100kb text file
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/tests/benchmarks/hash-object__text_cached_10mb b/benchmarks/cli/hash-object__text_10mb
similarity index 81%
rename from tests/benchmarks/hash-object__text_cached_10mb
rename to benchmarks/cli/hash-object__text_10mb
index 311ddca4c27..981db6452ad 100755
--- a/tests/benchmarks/hash-object__text_cached_10mb
+++ b/benchmarks/cli/hash-object__text_10mb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: hash a 10mb text file
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/tests/benchmarks/hash-object__text_cached_1kb b/benchmarks/cli/hash-object__text_1kb
similarity index 81%
rename from tests/benchmarks/hash-object__text_cached_1kb
rename to benchmarks/cli/hash-object__text_1kb
index 44c06ead7a3..a6d74d7f478 100755
--- a/tests/benchmarks/hash-object__text_cached_1kb
+++ b/benchmarks/cli/hash-object__text_1kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: hash a 1kb text file
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
diff --git a/tests/benchmarks/hash-object__text_100kb b/benchmarks/cli/hash-object__text_nocache_100kb
similarity index 70%
rename from tests/benchmarks/hash-object__text_100kb
rename to benchmarks/cli/hash-object__text_nocache_100kb
index d77f224b996..83869b46142 100755
--- a/tests/benchmarks/hash-object__text_100kb
+++ b/benchmarks/cli/hash-object__text_nocache_100kb
@@ -1,7 +1,11 @@
 #!/bin/bash -e
+#
+# Description: hash a 100kb text file (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "create_text_file text_100kb 102400 &&
                     flush_disk_cache" \
          hash-object "text_100kb"
diff --git a/tests/benchmarks/hash-object__text_10mb b/benchmarks/cli/hash-object__text_nocache_10mb
similarity index 70%
rename from tests/benchmarks/hash-object__text_10mb
rename to benchmarks/cli/hash-object__text_nocache_10mb
index 215afc6c3ab..0919eefd3c7 100755
--- a/tests/benchmarks/hash-object__text_10mb
+++ b/benchmarks/cli/hash-object__text_nocache_10mb
@@ -1,7 +1,11 @@
 #!/bin/bash -e
+#
+# Description: hash a 10mb text file (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "create_text_file text_10mb 10485760 &&
                     flush_disk_cache" \
          hash-object "text_10mb"
diff --git a/tests/benchmarks/hash-object__text_1kb b/benchmarks/cli/hash-object__text_nocache_1kb
similarity index 69%
rename from tests/benchmarks/hash-object__text_1kb
rename to benchmarks/cli/hash-object__text_nocache_1kb
index 1348b2fea66..a7a5a54d764 100755
--- a/tests/benchmarks/hash-object__text_1kb
+++ b/benchmarks/cli/hash-object__text_nocache_1kb
@@ -1,7 +1,11 @@
 #!/bin/bash -e
+#
+# Description: hash a 1kb text file (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "create_text_file text_1kb 1024 &&
                     flush_disk_cache" \
          hash-object "text_1kb"
diff --git a/tests/benchmarks/hash-object__write_text_cached_100kb b/benchmarks/cli/hash-object__write_text_100kb
similarity index 69%
rename from tests/benchmarks/hash-object__write_text_cached_100kb
rename to benchmarks/cli/hash-object__write_text_100kb
index 6803eeeaef7..971e8897f26 100755
--- a/tests/benchmarks/hash-object__write_text_cached_100kb
+++ b/benchmarks/cli/hash-object__write_text_100kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: write a 100kb text file to the object database
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
@@ -6,4 +8,4 @@ gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_100kb 102400" \
          --warmup 5 \
          --chdir "empty_standard_repo" \
-         hash-object "../text_100kb"
+         hash-object -w "../text_100kb"
diff --git a/tests/benchmarks/hash-object__write_text_cached_10mb b/benchmarks/cli/hash-object__write_text_10mb
similarity index 69%
rename from tests/benchmarks/hash-object__write_text_cached_10mb
rename to benchmarks/cli/hash-object__write_text_10mb
index 4335cc86e41..fe04d60175a 100755
--- a/tests/benchmarks/hash-object__write_text_cached_10mb
+++ b/benchmarks/cli/hash-object__write_text_10mb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: write a 10mb text file to the object database
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
@@ -6,4 +8,4 @@ gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_10mb 10485760" \
          --warmup 5 \
          --chdir "empty_standard_repo" \
-         hash-object "../text_10mb"
+         hash-object -w "../text_10mb"
diff --git a/tests/benchmarks/hash-object__write_text_cached_1kb b/benchmarks/cli/hash-object__write_text_1kb
similarity index 69%
rename from tests/benchmarks/hash-object__write_text_cached_1kb
rename to benchmarks/cli/hash-object__write_text_1kb
index 8a4c5c97b3f..163e7f1650c 100755
--- a/tests/benchmarks/hash-object__write_text_cached_1kb
+++ b/benchmarks/cli/hash-object__write_text_1kb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: write a 1kb text file to the object database
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
@@ -6,4 +8,4 @@ gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_1kb 1024" \
          --warmup 5 \
          --chdir "empty_standard_repo" \
-         hash-object "../text_1kb"
+         hash-object -w "../text_1kb"
diff --git a/tests/benchmarks/hash-object__write_text_100kb b/benchmarks/cli/hash-object__write_text_nocache_100kb
similarity index 75%
rename from tests/benchmarks/hash-object__write_text_100kb
rename to benchmarks/cli/hash-object__write_text_nocache_100kb
index fb72c092745..a3e691c3fb2 100755
--- a/tests/benchmarks/hash-object__write_text_100kb
+++ b/benchmarks/cli/hash-object__write_text_nocache_100kb
@@ -1,7 +1,11 @@
 #!/bin/bash -e
+#
+# Description: write a 100kb text file to the ODB (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_100kb 102400 &&
                     flush_disk_cache" \
diff --git a/tests/benchmarks/hash-object__write_text_10mb b/benchmarks/cli/hash-object__write_text_nocache_10mb
similarity index 65%
rename from tests/benchmarks/hash-object__write_text_10mb
rename to benchmarks/cli/hash-object__write_text_nocache_10mb
index 9da091986fd..83bd2dc037c 100755
--- a/tests/benchmarks/hash-object__write_text_10mb
+++ b/benchmarks/cli/hash-object__write_text_nocache_10mb
@@ -1,9 +1,13 @@
 #!/bin/bash -e
+#
+# Description: write a 10mb text file to the ODB (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_10mb 10485760 &&
                     flush_disk_cache" \
          --chdir "empty_standard_repo" \
-         hash-object "../text_10mb"
+         hash-object -w "../text_10mb"
diff --git a/tests/benchmarks/hash-object__write_text_1kb b/benchmarks/cli/hash-object__write_text_nocache_1kb
similarity index 65%
rename from tests/benchmarks/hash-object__write_text_1kb
rename to benchmarks/cli/hash-object__write_text_nocache_1kb
index ca34393adc6..3bc3adcf129 100755
--- a/tests/benchmarks/hash-object__write_text_1kb
+++ b/benchmarks/cli/hash-object__write_text_nocache_1kb
@@ -1,9 +1,13 @@
 #!/bin/bash -e
+#
+# Description: write a 1kb text file to the ODB (after flushing disk cache)
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
+needs_admin
+
 gitbench --prepare "sandbox_repo empty_standard_repo &&
                     create_text_file text_1kb 1024 &&
                     flush_disk_cache" \
          --chdir "empty_standard_repo" \
-         hash-object "../text_1kb"
+         hash-object -w "../text_1kb"
diff --git a/tests/benchmarks/indexpack__250mb b/benchmarks/cli/indexpack__250mb
similarity index 88%
rename from tests/benchmarks/indexpack__250mb
rename to benchmarks/cli/indexpack__250mb
index 5bd964786ae..311b587f084 100755
--- a/tests/benchmarks/indexpack__250mb
+++ b/benchmarks/cli/indexpack__250mb
@@ -1,4 +1,6 @@
 #!/bin/bash -e
+#
+# Description: index a 250mb packfile
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/libgit2/libgit2/compare/main...ethomson/benchmarks.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/libgit2/libgit2/compare/main...ethomson/benchmarks.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/libgit2/libgit2/compare/main...ethomson/benchmarks.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/libgit2/libgit2/compare/main...ethomson/benchmarks.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>