diff --git a/library/compiler-builtins/Cargo.lock b/library/compiler-builtins/Cargo.lock
index 274084fb4d64..372e7e68f5fb 100644
--- a/library/compiler-builtins/Cargo.lock
+++ b/library/compiler-builtins/Cargo.lock
@@ -155,9 +155,6 @@ dependencies = [
  "paste",
  "rand_xoshiro",
  "rustc_apfloat",
- "test",
- "utest-cortex-m-qemu",
- "utest-macros",
 ]
 
 [[package]]
@@ -1084,12 +1081,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "sc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "010e18bd3bfd1d45a7e666b236c78720df0d9a7698ebaa9c1c559961eb60a38b"
-
 [[package]]
 name = "semver"
 version = "1.0.27"
@@ -1206,11 +1197,6 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
 
-[[package]]
-name = "test"
-version = "0.1.0"
-source = "git+https://github.com/japaric/utest#e32073e2b078e3bee46001c13ae4c1acf368d762"
-
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -1251,19 +1237,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3"
 
-[[package]]
-name = "utest-cortex-m-qemu"
-version = "0.1.0"
-source = "git+https://github.com/japaric/utest#e32073e2b078e3bee46001c13ae4c1acf368d762"
-dependencies = [
- "sc",
-]
-
-[[package]]
-name = "utest-macros"
-version = "0.1.0"
-source = "git+https://github.com/japaric/utest#e32073e2b078e3bee46001c13ae4c1acf368d762"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
diff --git a/library/compiler-builtins/builtins-shim/Cargo.toml b/library/compiler-builtins/builtins-shim/Cargo.toml
index 33e909ccce55..0ff2acdbbe6a 100644
--- a/library/compiler-builtins/builtins-shim/Cargo.toml
+++ b/library/compiler-builtins/builtins-shim/Cargo.toml
@@ -54,7 +54,8 @@ no-asm = []
 # when using as `std`'s dependency.'
 compiler-builtins = ["unmangled-names"]
 
-# Generate memory-related intrinsics like memcpy
+# Enable `no_mangle` symbols for memory-related intrinsics like memcpy. The
+# mangled versions are always available.
 mem = []
 
 # Enable `no_mangle` symbols so this crate gets used as the runtime intrinsic
diff --git a/library/compiler-builtins/builtins-test-intrinsics/Cargo.toml b/library/compiler-builtins/builtins-test-intrinsics/Cargo.toml
index 623e2e8e067d..fed2ac39fb32 100644
--- a/library/compiler-builtins/builtins-test-intrinsics/Cargo.toml
+++ b/library/compiler-builtins/builtins-test-intrinsics/Cargo.toml
@@ -6,9 +6,15 @@ publish = false
 license = "MIT OR Apache-2.0"
 
 [dependencies]
+# FIXME: `aeabi_mem*` tests will require the "mem" feature to be enabled here.
 compiler_builtins = { path = "../builtins-shim", features = ["compiler-builtins", "unmangled-names"] }
 panic-handler = { path = "../crates/panic-handler" }
 
+[target.'cfg(all(target_arch = "arm", not(any(target_env = "gnu", target_env = "musl")), target_os = "linux"))'.dev-dependencies]
+test = { git = "https://github.com/japaric/utest" }
+utest-cortex-m-qemu = { default-features = false, git = "https://github.com/japaric/utest" }
+utest-macros = { git = "https://github.com/japaric/utest" }
+
 [features]
 c = ["compiler_builtins/c"]
 
diff --git a/library/compiler-builtins/builtins-test-intrinsics/src/main.rs b/library/compiler-builtins/builtins-test-intrinsics/src/main.rs
index a3df2c98376c..e390590946f4 100644
--- a/library/compiler-builtins/builtins-test-intrinsics/src/main.rs
+++ b/library/compiler-builtins/builtins-test-intrinsics/src/main.rs
@@ -1,7 +1,9 @@
-// By compiling this file we check that all the intrinsics we care about continue to be provided by
-// the `compiler_builtins` crate regardless of the changes we make to it. If we, by mistake, stop
-// compiling a C implementation and forget to implement that intrinsic in Rust, this file will fail
-// to link due to the missing intrinsic (symbol).
+//! Tests that require unmangled symbols from `compiler-builtins`.
+//!
+//! By compiling this file we check that all the intrinsics we care about continue to be provided by
+//! the `compiler_builtins` crate regardless of the changes we make to it. If we, by mistake, stop
+//! compiling a C implementation and forget to implement that intrinsic in Rust, this file will fail
+//! to link due to the missing intrinsic (symbol).
 
 #![allow(internal_features, unused_features)]
 #![deny(dead_code)]
diff --git a/library/compiler-builtins/builtins-test/tests/aeabi_memclr.rs b/library/compiler-builtins/builtins-test-intrinsics/tests/aeabi_memclr.rs
similarity index 98%
rename from library/compiler-builtins/builtins-test/tests/aeabi_memclr.rs
rename to library/compiler-builtins/builtins-test-intrinsics/tests/aeabi_memclr.rs
index 0761feaffd9e..df0e6a6d5299 100644
--- a/library/compiler-builtins/builtins-test/tests/aeabi_memclr.rs
+++ b/library/compiler-builtins/builtins-test-intrinsics/tests/aeabi_memclr.rs
@@ -2,7 +2,6 @@
     target_arch = "arm",
     not(any(target_env = "gnu", target_env = "musl")),
     target_os = "linux",
-    feature = "mem"
 ))]
 #![feature(compiler_builtins_lib)]
 #![no_std]
diff --git a/library/compiler-builtins/builtins-test/tests/aeabi_memcpy.rs b/library/compiler-builtins/builtins-test-intrinsics/tests/aeabi_memcpy.rs
similarity index 98%
rename from library/compiler-builtins/builtins-test/tests/aeabi_memcpy.rs
rename to library/compiler-builtins/builtins-test-intrinsics/tests/aeabi_memcpy.rs
index e76e712a246f..acd12eef64ba 100644
--- a/library/compiler-builtins/builtins-test/tests/aeabi_memcpy.rs
+++ b/library/compiler-builtins/builtins-test-intrinsics/tests/aeabi_memcpy.rs
@@ -2,7 +2,6 @@
     target_arch = "arm",
     not(any(target_env = "gnu", target_env = "musl")),
     target_os = "linux",
-    feature = "mem"
 ))]
 #![feature(compiler_builtins_lib)]
 #![no_std]
diff --git a/library/compiler-builtins/builtins-test/tests/aeabi_memset.rs b/library/compiler-builtins/builtins-test-intrinsics/tests/aeabi_memset.rs
similarity index 99%
rename from library/compiler-builtins/builtins-test/tests/aeabi_memset.rs
rename to library/compiler-builtins/builtins-test-intrinsics/tests/aeabi_memset.rs
index 8f9f80f969cc..98d2c6852d14 100644
--- a/library/compiler-builtins/builtins-test/tests/aeabi_memset.rs
+++ b/library/compiler-builtins/builtins-test-intrinsics/tests/aeabi_memset.rs
@@ -2,7 +2,6 @@
     target_arch = "arm",
     not(any(target_env = "gnu", target_env = "musl")),
     target_os = "linux",
-    feature = "mem"
 ))]
 #![feature(compiler_builtins_lib)]
 #![no_std]
diff --git a/library/compiler-builtins/builtins-test/Cargo.toml b/library/compiler-builtins/builtins-test/Cargo.toml
index 8318c2344dfe..7f8584286d05 100644
--- a/library/compiler-builtins/builtins-test/Cargo.toml
+++ b/library/compiler-builtins/builtins-test/Cargo.toml
@@ -23,16 +23,10 @@ gungraun = { workspace = true, optional = true }
 [dev-dependencies]
 paste.workspace = true
 
-[target.'cfg(all(target_arch = "arm", not(any(target_env = "gnu", target_env = "musl")), target_os = "linux"))'.dev-dependencies]
-test = { git = "https://github.com/japaric/utest" }
-utest-cortex-m-qemu = { default-features = false, git = "https://github.com/japaric/utest" }
-utest-macros = { git = "https://github.com/japaric/utest" }
-
 [features]
 default = []
 c = ["compiler_builtins/c"]
 no-asm = ["compiler_builtins/no-asm"]
-mem = ["compiler_builtins/mem"]
 # Skip tests that rely on f128 symbols being available on the system
 no-sys-f128 = ["no-sys-f128-int-convert", "no-sys-f16-f128-convert"]
 # Some platforms have some f128 functions but everything except integer conversions
diff --git a/library/compiler-builtins/compiler-builtins/Cargo.toml b/library/compiler-builtins/compiler-builtins/Cargo.toml
index 2da517936ee1..2299ae8e3aaf 100644
--- a/library/compiler-builtins/compiler-builtins/Cargo.toml
+++ b/library/compiler-builtins/compiler-builtins/Cargo.toml
@@ -49,8 +49,8 @@ no-asm = []
 # when using as `std`'s dependency.'
 compiler-builtins = ["dep:core", "unmangled-names"]
 
-# Generate memory-related intrinsics like memcpy
-mem = []
+# Enable `no_mangle` symbols for memory-related intrinsics like memcpy. The
+# mangled versions are always available.
 
 # Enable `no_mangle` symbols so this crate gets used as the runtime intrinsic
 # implementation. Leave this disabled for testing to avoid conflicting with
diff --git a/library/compiler-builtins/compiler-builtins/src/macros.rs b/library/compiler-builtins/compiler-builtins/src/macros.rs
index 255ba78dff1e..c5e49f778064 100644
--- a/library/compiler-builtins/compiler-builtins/src/macros.rs
+++ b/library/compiler-builtins/compiler-builtins/src/macros.rs
@@ -392,7 +392,7 @@ extern "aapcs" fn $alias( $($argname: $ty),* ) $(-> $ret)? {
         intrinsics!($($rest)*);
     );
 
-    // C mem* functions are only generated when the "mem" feature is enabled.
+    // C mem* functions are only exposed via `no_mangle` when the "mem" feature is enabled.
     (
         #[mem_builtin]
         $(#[$($attr:tt)*])*