diff --git a/mk/tests.mk b/mk/tests.mk
index 6b6f515ce2b5a..b00514ace1392 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -427,7 +427,7 @@ RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
 RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
 CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
 CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
-BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
+BENCH_RS := $(wildcard $(S)src/test/bench/*.rs) $(wildcard $(S)src/test/bench/extra/*.rs) $(wildcard $(S)src/test/bench/rt/*.rs) $(wildcard $(S)src/test/bench/shootout/*.rs) $(wildcard $(S)src/test/bench/std/*.rs))
 PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
 DEBUGINFO_RS := $(wildcard $(S)src/test/debug-info/*.rs)
 
diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/extra/smallintmap.rs
similarity index 100%
rename from src/test/bench/std-smallintmap.rs
rename to src/test/bench/extra/smallintmap.rs
diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/rt/msgsend-pipes-shared.rs
similarity index 100%
rename from src/test/bench/msgsend-pipes-shared.rs
rename to src/test/bench/rt/msgsend-pipes-shared.rs
diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/rt/msgsend-pipes.rs
similarity index 100%
rename from src/test/bench/msgsend-pipes.rs
rename to src/test/bench/rt/msgsend-pipes.rs
diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/rt/msgsend-ring-mutex-arcs.rs
similarity index 100%
rename from src/test/bench/msgsend-ring-mutex-arcs.rs
rename to src/test/bench/rt/msgsend-ring-mutex-arcs.rs
diff --git a/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/rt/msgsend-ring-pipes.rs
similarity index 100%
rename from src/test/bench/msgsend-ring-pipes.rs
rename to src/test/bench/rt/msgsend-ring-pipes.rs
diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/rt/msgsend-ring-rw-arcs.rs
similarity index 100%
rename from src/test/bench/msgsend-ring-rw-arcs.rs
rename to src/test/bench/rt/msgsend-ring-rw-arcs.rs
diff --git a/src/test/bench/pingpong.rs b/src/test/bench/rt/pingpong.rs
similarity index 100%
rename from src/test/bench/pingpong.rs
rename to src/test/bench/rt/pingpong.rs
diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/rt/task-perf-alloc-unwind.rs
similarity index 100%
rename from src/test/bench/task-perf-alloc-unwind.rs
rename to src/test/bench/rt/task-perf-alloc-unwind.rs
diff --git a/src/test/bench/task-perf-jargon-metal-smoke.rs b/src/test/bench/rt/task-perf-jargon-metal-smoke.rs
similarity index 100%
rename from src/test/bench/task-perf-jargon-metal-smoke.rs
rename to src/test/bench/rt/task-perf-jargon-metal-smoke.rs
diff --git a/src/test/bench/task-perf-linked-failure.rs b/src/test/bench/rt/task-perf-linked-failure.rs
similarity index 100%
rename from src/test/bench/task-perf-linked-failure.rs
rename to src/test/bench/rt/task-perf-linked-failure.rs
diff --git a/src/test/bench/task-perf-one-million.rs b/src/test/bench/rt/task-perf-one-million.rs
similarity index 100%
rename from src/test/bench/task-perf-one-million.rs
rename to src/test/bench/rt/task-perf-one-million.rs
diff --git a/src/test/bench/task-perf-spawnalot.rs b/src/test/bench/rt/task-perf-spawnalot.rs
similarity index 100%
rename from src/test/bench/task-perf-spawnalot.rs
rename to src/test/bench/rt/task-perf-spawnalot.rs
diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout/ackermann.rs
similarity index 100%
rename from src/test/bench/shootout-ackermann.rs
rename to src/test/bench/shootout/ackermann.rs
diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout/binarytrees.rs
similarity index 100%
rename from src/test/bench/shootout-binarytrees.rs
rename to src/test/bench/shootout/binarytrees.rs
diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout/chameneos-redux.rs
similarity index 100%
rename from src/test/bench/shootout-chameneos-redux.rs
rename to src/test/bench/shootout/chameneos-redux.rs
diff --git a/src/test/bench/shootout-fannkuch-redux.rs b/src/test/bench/shootout/fannkuch-redux.rs
similarity index 100%
rename from src/test/bench/shootout-fannkuch-redux.rs
rename to src/test/bench/shootout/fannkuch-redux.rs
diff --git a/src/test/bench/shootout-fasta-redux.rs b/src/test/bench/shootout/fasta-redux.rs
similarity index 100%
rename from src/test/bench/shootout-fasta-redux.rs
rename to src/test/bench/shootout/fasta-redux.rs
diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout/fasta.rs
similarity index 100%
rename from src/test/bench/shootout-fasta.rs
rename to src/test/bench/shootout/fasta.rs
diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout/fibo.rs
similarity index 100%
rename from src/test/bench/shootout-fibo.rs
rename to src/test/bench/shootout/fibo.rs
diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout/k-nucleotide-pipes.rs
similarity index 100%
rename from src/test/bench/shootout-k-nucleotide-pipes.rs
rename to src/test/bench/shootout/k-nucleotide-pipes.rs
diff --git a/src/test/bench/shootout-k-nucleotide.data b/src/test/bench/shootout/k-nucleotide.data
similarity index 100%
rename from src/test/bench/shootout-k-nucleotide.data
rename to src/test/bench/shootout/k-nucleotide.data
diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout/k-nucleotide.rs
similarity index 100%
rename from src/test/bench/shootout-k-nucleotide.rs
rename to src/test/bench/shootout/k-nucleotide.rs
diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout/mandelbrot.rs
similarity index 100%
rename from src/test/bench/shootout-mandelbrot.rs
rename to src/test/bench/shootout/mandelbrot.rs
diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout/nbody.rs
similarity index 100%
rename from src/test/bench/shootout-nbody.rs
rename to src/test/bench/shootout/nbody.rs
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout/pfib.rs
similarity index 100%
rename from src/test/bench/shootout-pfib.rs
rename to src/test/bench/shootout/pfib.rs
diff --git a/src/test/bench/shootout-pidigits.rs b/src/test/bench/shootout/pidigits.rs
similarity index 100%
rename from src/test/bench/shootout-pidigits.rs
rename to src/test/bench/shootout/pidigits.rs
diff --git a/src/test/bench/shootout-reverse-complement.rs b/src/test/bench/shootout/reverse-complement.rs
similarity index 100%
rename from src/test/bench/shootout-reverse-complement.rs
rename to src/test/bench/shootout/reverse-complement.rs
diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout/spectralnorm.rs
similarity index 100%
rename from src/test/bench/shootout-spectralnorm.rs
rename to src/test/bench/shootout/spectralnorm.rs
diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout/threadring.rs
similarity index 100%
rename from src/test/bench/shootout-threadring.rs
rename to src/test/bench/shootout/threadring.rs
diff --git a/src/test/bench/core-map.rs b/src/test/bench/std/map.rs
similarity index 100%
rename from src/test/bench/core-map.rs
rename to src/test/bench/std/map.rs
diff --git a/src/test/bench/core-set.rs b/src/test/bench/std/set.rs
similarity index 100%
rename from src/test/bench/core-set.rs
rename to src/test/bench/std/set.rs
diff --git a/src/test/bench/core-std.rs b/src/test/bench/std/std.rs
similarity index 98%
rename from src/test/bench/core-std.rs
rename to src/test/bench/std/std.rs
index 867be38545cdf..7fce673506e05 100644
--- a/src/test/bench/core-std.rs
+++ b/src/test/bench/std/std.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // Microbenchmarks for various functions in std and extra
+// FIXME #7685: rewrite to use the new bench runner
 
 extern mod extra;
 
diff --git a/src/test/bench/core-uint-to-str.rs b/src/test/bench/std/uint-to-str.rs
similarity index 100%
rename from src/test/bench/core-uint-to-str.rs
rename to src/test/bench/std/uint-to-str.rs