diff --git a/library/compiler-builtins/crates/util/Cargo.toml b/library/compiler-builtins/crates/util/Cargo.toml
index 88e0b332065d..c56e2cc12ea5 100644
--- a/library/compiler-builtins/crates/util/Cargo.toml
+++ b/library/compiler-builtins/crates/util/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2024"
 publish = false
 license = "MIT OR Apache-2.0"
 
-[features]
-default = ["build-musl", "build-mpfr", "unstable-float"]
-build-musl = ["libm-test/build-musl", "dep:musl-math-sys"]
-build-mpfr = ["libm-test/build-mpfr", "dep:rug"]
-unstable-float = ["libm/unstable-float", "libm-test/unstable-float", "rug?/nightly-float"]
-
 [dependencies]
 libm.workspace = true
 libm-macros.workspace = true
 libm-test.workspace = true
 musl-math-sys = { workspace = true, optional = true }
 rug = { workspace = true, optional = true }
+
+[features]
+default = ["build-musl", "build-mpfr", "unstable-float"]
+build-musl = ["libm-test/build-musl", "dep:musl-math-sys"]
+build-mpfr = ["libm-test/build-mpfr", "dep:rug"]
+unstable-float = ["libm/unstable-float", "libm-test/unstable-float", "rug?/nightly-float"]
diff --git a/library/compiler-builtins/libm-test/Cargo.toml b/library/compiler-builtins/libm-test/Cargo.toml
index c395d6a21bd5..4f65504bd584 100644
--- a/library/compiler-builtins/libm-test/Cargo.toml
+++ b/library/compiler-builtins/libm-test/Cargo.toml
@@ -5,28 +5,6 @@ edition = "2024"
 publish = false
 license = "MIT OR Apache-2.0"
 
-[features]
-default = ["build-mpfr", "unstable-float"]
-
-# Propagated from libm because this affects which functions we test.
-unstable-float = ["libm/unstable-float", "rug?/nightly-float"]
-
-# Generate tests which are random inputs and the outputs are calculated with
-# musl libc.
-build-mpfr = ["dep:rug", "dep:gmp-mpfr-sys"]
-
-# Build our own musl for testing and benchmarks
-build-musl = ["dep:musl-math-sys"]
-
-# Enable report generation without bringing in more dependencies by default
-benchmarking-reports = ["criterion/plotters", "criterion/html_reports"]
-
-# Enable icount benchmarks (requires gungraun-runner and valgrind locally)
-icount = ["dep:gungraun"]
-
-# Run with a reduced set of benchmarks, such as for CI
-short-benchmarks = []
-
 [dependencies]
 anyhow.workspace = true
 # This is not directly used but is required so we can enable `gmp-mpfr-sys/force-cross`.
@@ -52,6 +30,28 @@ rand = { workspace = true, optional = true }
 criterion.workspace = true
 libtest-mimic.workspace = true
 
+[features]
+default = ["build-mpfr", "unstable-float"]
+
+# Propagated from libm because this affects which functions we test.
+unstable-float = ["libm/unstable-float", "rug?/nightly-float"]
+
+# Generate tests which are random inputs and the outputs are calculated with
+# musl libc.
+build-mpfr = ["dep:rug", "dep:gmp-mpfr-sys"]
+
+# Build our own musl for testing and benchmarks
+build-musl = ["dep:musl-math-sys"]
+
+# Enable report generation without bringing in more dependencies by default
+benchmarking-reports = ["criterion/plotters", "criterion/html_reports"]
+
+# Enable icount benchmarks (requires gungraun-runner and valgrind locally)
+icount = ["dep:gungraun"]
+
+# Run with a reduced set of benchmarks, such as for CI
+short-benchmarks = []
+
 [[bench]]
 name = "icount"
 harness = false
diff --git a/library/compiler-builtins/libm/Cargo.toml b/library/compiler-builtins/libm/Cargo.toml
index 617914a4dfae..d80ddab0ab7a 100644
--- a/library/compiler-builtins/libm/Cargo.toml
+++ b/library/compiler-builtins/libm/Cargo.toml
@@ -15,6 +15,10 @@ license = "MIT"
 edition = "2021"
 rust-version = "1.63"
 
+[dev-dependencies]
+# FIXME(msrv): switch to `no-panic.workspace` when possible
+no-panic = "0.1.35"
+
 [features]
 default = ["arch"]
 
@@ -42,10 +46,6 @@ unstable-float = []
 # hard float operations.
 force-soft-floats = []
 
-[dev-dependencies]
-# FIXME(msrv): switch to `no-panic.workspace` when possible
-no-panic = "0.1.35"
-
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = [
   # compiler-builtins sets this feature, but we use it in `libm`