diff --git a/Cargo.toml b/Cargo.toml
index db4c45dfa..2e17c303a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,16 +2,16 @@
 resolver = "3"
 members = [
     # Note that builtins-test-intrinsics cannot be a default member because it
-    # needs the `mangled-names` feature disabled, while `testcrate` needs it
-    # enabled.
+    # needs the `mangled-names` feature disabled, while `builtins-test` needs
+    # it enabled.
+    "builtins-test",
     "builtins-test-intrinsics",
     "compiler-builtins",
-    "testcrate",
 ]
 
 default-members = [
     "compiler-builtins",
-    "testcrate",
+    "builtins-test",
 ]
 
 [profile.release]
diff --git a/testcrate/Cargo.toml b/builtins-test/Cargo.toml
similarity index 93%
rename from testcrate/Cargo.toml
rename to builtins-test/Cargo.toml
index bda2b641d..526e9b18a 100644
--- a/testcrate/Cargo.toml
+++ b/builtins-test/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "testcrate"
+name = "builtins-test"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2024"
@@ -56,8 +56,9 @@ icount = ["dep:iai-callgrind"]
 benchmarking-reports = ["criterion/plotters", "criterion/html_reports"]
 
 # NOTE: benchmarks must be run with `--no-default-features` or with
-# `-p testcrate`, otherwise the default `compiler-builtins` feature of the
-# `compiler_builtins` crate gets activated, resulting in linker errors.
+# `-p builtins-test`, otherwise the default `compiler-builtins` feature
+# of the `compiler_builtins` crate gets activated, resulting in linker
+# errors.
 
 [[bench]]
 name = "float_add"
diff --git a/testcrate/benches/float_add.rs b/builtins-test/benches/float_add.rs
similarity index 98%
rename from testcrate/benches/float_add.rs
rename to builtins-test/benches/float_add.rs
index a578655f8..197f90b31 100644
--- a/testcrate/benches/float_add.rs
+++ b/builtins-test/benches/float_add.rs
@@ -1,8 +1,8 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
+use builtins_test::float_bench;
 use compiler_builtins::float::add;
 use criterion::{Criterion, criterion_main};
-use testcrate::float_bench;
 
 float_bench! {
     name: add_f32,
diff --git a/testcrate/benches/float_cmp.rs b/builtins-test/benches/float_cmp.rs
similarity index 99%
rename from testcrate/benches/float_cmp.rs
rename to builtins-test/benches/float_cmp.rs
index 4c269e488..4493765ec 100644
--- a/testcrate/benches/float_cmp.rs
+++ b/builtins-test/benches/float_cmp.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
+use builtins_test::float_bench;
 use criterion::{Criterion, criterion_main};
-use testcrate::float_bench;
 
 use compiler_builtins::float::cmp;
 
diff --git a/testcrate/benches/float_conv.rs b/builtins-test/benches/float_conv.rs
similarity index 99%
rename from testcrate/benches/float_conv.rs
rename to builtins-test/benches/float_conv.rs
index e3f2af863..d4a7346d1 100644
--- a/testcrate/benches/float_conv.rs
+++ b/builtins-test/benches/float_conv.rs
@@ -1,9 +1,9 @@
 #![allow(improper_ctypes)]
 #![cfg_attr(f128_enabled, feature(f128))]
 
+use builtins_test::float_bench;
 use compiler_builtins::float::conv;
 use criterion::{Criterion, criterion_main};
-use testcrate::float_bench;
 
 /* unsigned int -> float */
 
diff --git a/testcrate/benches/float_div.rs b/builtins-test/benches/float_div.rs
similarity index 98%
rename from testcrate/benches/float_div.rs
rename to builtins-test/benches/float_div.rs
index c42f3f386..d5b0ad0fd 100644
--- a/testcrate/benches/float_div.rs
+++ b/builtins-test/benches/float_div.rs
@@ -1,8 +1,8 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
+use builtins_test::float_bench;
 use compiler_builtins::float::div;
 use criterion::{Criterion, criterion_main};
-use testcrate::float_bench;
 
 float_bench! {
     name: div_f32,
diff --git a/testcrate/benches/float_extend.rs b/builtins-test/benches/float_extend.rs
similarity index 99%
rename from testcrate/benches/float_extend.rs
rename to builtins-test/benches/float_extend.rs
index 1e7fedefe..fc44e80c9 100644
--- a/testcrate/benches/float_extend.rs
+++ b/builtins-test/benches/float_extend.rs
@@ -2,9 +2,9 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 #![cfg_attr(f16_enabled, feature(f16))]
 
+use builtins_test::float_bench;
 use compiler_builtins::float::extend;
 use criterion::{Criterion, criterion_main};
-use testcrate::float_bench;
 
 #[cfg(f16_enabled)]
 float_bench! {
diff --git a/testcrate/benches/float_mul.rs b/builtins-test/benches/float_mul.rs
similarity index 98%
rename from testcrate/benches/float_mul.rs
rename to builtins-test/benches/float_mul.rs
index 0857a68a2..a7a2d34aa 100644
--- a/testcrate/benches/float_mul.rs
+++ b/builtins-test/benches/float_mul.rs
@@ -1,8 +1,8 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
+use builtins_test::float_bench;
 use compiler_builtins::float::mul;
 use criterion::{Criterion, criterion_main};
-use testcrate::float_bench;
 
 float_bench! {
     name: mul_f32,
diff --git a/testcrate/benches/float_pow.rs b/builtins-test/benches/float_pow.rs
similarity index 97%
rename from testcrate/benches/float_pow.rs
rename to builtins-test/benches/float_pow.rs
index e84fee51c..64e37dd32 100644
--- a/testcrate/benches/float_pow.rs
+++ b/builtins-test/benches/float_pow.rs
@@ -1,8 +1,8 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
+use builtins_test::float_bench;
 use compiler_builtins::float::pow;
 use criterion::{Criterion, criterion_main};
-use testcrate::float_bench;
 
 float_bench! {
     name: powi_f32,
diff --git a/testcrate/benches/float_sub.rs b/builtins-test/benches/float_sub.rs
similarity index 98%
rename from testcrate/benches/float_sub.rs
rename to builtins-test/benches/float_sub.rs
index 7a6c05ea5..8bae294cd 100644
--- a/testcrate/benches/float_sub.rs
+++ b/builtins-test/benches/float_sub.rs
@@ -1,8 +1,8 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 
+use builtins_test::float_bench;
 use compiler_builtins::float::sub;
 use criterion::{Criterion, criterion_main};
-use testcrate::float_bench;
 
 float_bench! {
     name: sub_f32,
diff --git a/testcrate/benches/float_trunc.rs b/builtins-test/benches/float_trunc.rs
similarity index 99%
rename from testcrate/benches/float_trunc.rs
rename to builtins-test/benches/float_trunc.rs
index 4ceb62ab0..43310c7cf 100644
--- a/testcrate/benches/float_trunc.rs
+++ b/builtins-test/benches/float_trunc.rs
@@ -1,9 +1,9 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 #![cfg_attr(f16_enabled, feature(f16))]
 
+use builtins_test::float_bench;
 use compiler_builtins::float::trunc;
 use criterion::{Criterion, criterion_main};
-use testcrate::float_bench;
 
 #[cfg(f16_enabled)]
 float_bench! {
diff --git a/testcrate/benches/mem.rs b/builtins-test/benches/mem.rs
similarity index 100%
rename from testcrate/benches/mem.rs
rename to builtins-test/benches/mem.rs
diff --git a/testcrate/benches/mem_icount.rs b/builtins-test/benches/mem_icount.rs
similarity index 100%
rename from testcrate/benches/mem_icount.rs
rename to builtins-test/benches/mem_icount.rs
diff --git a/testcrate/build.rs b/builtins-test/build.rs
similarity index 100%
rename from testcrate/build.rs
rename to builtins-test/build.rs
diff --git a/testcrate/src/bench.rs b/builtins-test/src/bench.rs
similarity index 100%
rename from testcrate/src/bench.rs
rename to builtins-test/src/bench.rs
diff --git a/testcrate/src/lib.rs b/builtins-test/src/lib.rs
similarity index 99%
rename from testcrate/src/lib.rs
rename to builtins-test/src/lib.rs
index c61618755..a83aea562 100644
--- a/testcrate/src/lib.rs
+++ b/builtins-test/src/lib.rs
@@ -7,8 +7,8 @@
 //! edge case testing is crucial for checking cases like where both inputs are equal or equal to
 //! special values such as `i128::MIN`, which is unlikely for the random fuzzer by itself to
 //! encounter. The randomized fuzz testing is specially designed to cover wide swaths of search
-//! space in as few iterations as possible. See `fuzz_values` in `testcrate/tests/misc.rs` for an
-//! example.
+//! space in as few iterations as possible. See `fuzz_values` in `builtins-test/tests/misc.rs` for
+//! an example.
 //!
 //! Some floating point tests are disabled for specific architectures, because they do not have
 //! correct rounding.
diff --git a/testcrate/tests/addsub.rs b/builtins-test/tests/addsub.rs
similarity index 99%
rename from testcrate/tests/addsub.rs
rename to builtins-test/tests/addsub.rs
index 3c0e20f77..865b9e472 100644
--- a/testcrate/tests/addsub.rs
+++ b/builtins-test/tests/addsub.rs
@@ -1,7 +1,7 @@
 #![allow(unused_macros)]
 #![cfg_attr(f128_enabled, feature(f128))]
 
-use testcrate::*;
+use builtins_test::*;
 
 mod int_addsub {
     use super::*;
diff --git a/testcrate/tests/aeabi_memclr.rs b/builtins-test/tests/aeabi_memclr.rs
similarity index 100%
rename from testcrate/tests/aeabi_memclr.rs
rename to builtins-test/tests/aeabi_memclr.rs
diff --git a/testcrate/tests/aeabi_memcpy.rs b/builtins-test/tests/aeabi_memcpy.rs
similarity index 100%
rename from testcrate/tests/aeabi_memcpy.rs
rename to builtins-test/tests/aeabi_memcpy.rs
diff --git a/testcrate/tests/aeabi_memset.rs b/builtins-test/tests/aeabi_memset.rs
similarity index 100%
rename from testcrate/tests/aeabi_memset.rs
rename to builtins-test/tests/aeabi_memset.rs
diff --git a/testcrate/tests/big.rs b/builtins-test/tests/big.rs
similarity index 100%
rename from testcrate/tests/big.rs
rename to builtins-test/tests/big.rs
diff --git a/testcrate/tests/cmp.rs b/builtins-test/tests/cmp.rs
similarity index 99%
rename from testcrate/tests/cmp.rs
rename to builtins-test/tests/cmp.rs
index 19d90c664..dbedd213e 100644
--- a/testcrate/tests/cmp.rs
+++ b/builtins-test/tests/cmp.rs
@@ -2,7 +2,7 @@
 #![allow(unreachable_code)]
 #![cfg_attr(f128_enabled, feature(f128))]
 
-use testcrate::*;
+use builtins_test::*;
 
 mod float_comparisons {
     use super::*;
diff --git a/testcrate/tests/conv.rs b/builtins-test/tests/conv.rs
similarity index 99%
rename from testcrate/tests/conv.rs
rename to builtins-test/tests/conv.rs
index 381d3e155..491915d9b 100644
--- a/testcrate/tests/conv.rs
+++ b/builtins-test/tests/conv.rs
@@ -4,9 +4,9 @@
 #![allow(unused_macros)]
 #![allow(unused_imports)]
 
+use builtins_test::*;
 use compiler_builtins::float::Float;
 use rustc_apfloat::{Float as _, FloatConvert as _};
-use testcrate::*;
 
 mod i_to_f {
     use super::*;
diff --git a/testcrate/tests/div_rem.rs b/builtins-test/tests/div_rem.rs
similarity index 99%
rename from testcrate/tests/div_rem.rs
rename to builtins-test/tests/div_rem.rs
index ac87eb630..6c0280a32 100644
--- a/testcrate/tests/div_rem.rs
+++ b/builtins-test/tests/div_rem.rs
@@ -4,7 +4,7 @@
 use compiler_builtins::int::sdiv::{__divmoddi4, __divmodsi4, __divmodti4};
 use compiler_builtins::int::udiv::{__udivmoddi4, __udivmodsi4, __udivmodti4, u128_divide_sparc};
 
-use testcrate::*;
+use builtins_test::*;
 
 // Division algorithms have by far the nastiest and largest number of edge cases, and experience shows
 // that sometimes 100_000 iterations of the random fuzzer is needed.
diff --git a/testcrate/tests/float_pow.rs b/builtins-test/tests/float_pow.rs
similarity index 99%
rename from testcrate/tests/float_pow.rs
rename to builtins-test/tests/float_pow.rs
index 8d86392f5..8209543e6 100644
--- a/testcrate/tests/float_pow.rs
+++ b/builtins-test/tests/float_pow.rs
@@ -2,7 +2,7 @@
 #![cfg_attr(f128_enabled, feature(f128))]
 #![cfg(not(all(target_arch = "x86", not(target_feature = "sse"))))]
 
-use testcrate::*;
+use builtins_test::*;
 
 // This is approximate because of issues related to
 // https://github.com/rust-lang/rust/issues/73920.
diff --git a/testcrate/tests/lse.rs b/builtins-test/tests/lse.rs
similarity index 93%
rename from testcrate/tests/lse.rs
rename to builtins-test/tests/lse.rs
index cbecd6143..53167d98f 100644
--- a/testcrate/tests/lse.rs
+++ b/builtins-test/tests/lse.rs
@@ -14,7 +14,7 @@ mod cas {
     pub(super) macro test($_ordering:ident, $bytes:tt, $name:ident) {
         #[test]
         fn $name() {
-            testcrate::fuzz_2(10000, |expected: super::int_ty!($bytes), new| {
+            builtins_test::fuzz_2(10000, |expected: super::int_ty!($bytes), new| {
                 let mut target = expected.wrapping_add(10);
                 assert_eq!(
                     unsafe {
@@ -50,7 +50,7 @@ mod swap {
     pub(super) macro test($_ordering:ident, $bytes:tt, $name:ident) {
         #[test]
         fn $name() {
-            testcrate::fuzz_2(10000, |left: super::int_ty!($bytes), mut right| {
+            builtins_test::fuzz_2(10000, |left: super::int_ty!($bytes), mut right| {
                 let orig_right = right;
                 assert_eq!(
                     unsafe { compiler_builtins::aarch64_linux::$name::$name(left, &mut right) },
@@ -69,7 +69,7 @@ macro_rules! test_op {
                 ($_ordering:ident, $bytes:tt, $name:ident) => {
                     #[test]
                     fn $name() {
-                        testcrate::fuzz_2(10000, |old, val| {
+                        builtins_test::fuzz_2(10000, |old, val| {
                             let mut target = old;
                             let op: fn(super::int_ty!($bytes), super::int_ty!($bytes)) -> _ = $($op)*;
                             let expected = op(old, val);
diff --git a/testcrate/tests/mem.rs b/builtins-test/tests/mem.rs
similarity index 100%
rename from testcrate/tests/mem.rs
rename to builtins-test/tests/mem.rs
diff --git a/testcrate/tests/misc.rs b/builtins-test/tests/misc.rs
similarity index 99%
rename from testcrate/tests/misc.rs
rename to builtins-test/tests/misc.rs
index edbd3684d..b8c75c026 100644
--- a/testcrate/tests/misc.rs
+++ b/builtins-test/tests/misc.rs
@@ -1,7 +1,7 @@
 // makes configuration easier
 #![allow(unused_macros)]
 
-use testcrate::*;
+use builtins_test::*;
 
 /// Make sure that the the edge case tester and randomized tester don't break, and list examples of
 /// fuzz values for documentation purposes.
diff --git a/testcrate/tests/mul.rs b/builtins-test/tests/mul.rs
similarity index 99%
rename from testcrate/tests/mul.rs
rename to builtins-test/tests/mul.rs
index 2113b177d..198cacb34 100644
--- a/testcrate/tests/mul.rs
+++ b/builtins-test/tests/mul.rs
@@ -1,7 +1,7 @@
 #![allow(unused_macros)]
 #![cfg_attr(f128_enabled, feature(f128))]
 
-use testcrate::*;
+use builtins_test::*;
 
 mod int_mul {
     use super::*;
diff --git a/testcrate/tests/shift.rs b/builtins-test/tests/shift.rs
similarity index 97%
rename from testcrate/tests/shift.rs
rename to builtins-test/tests/shift.rs
index 23e3395ed..0f2483855 100644
--- a/testcrate/tests/shift.rs
+++ b/builtins-test/tests/shift.rs
@@ -1,4 +1,4 @@
-use testcrate::*;
+use builtins_test::*;
 
 macro_rules! shift {
     ($($i:ty, $fn_std:ident, $fn_builtins:ident);*;) => {
diff --git a/ci/miri.sh b/ci/miri.sh
index f9a1240a4..79e660bab 100755
--- a/ci/miri.sh
+++ b/ci/miri.sh
@@ -12,5 +12,5 @@ TARGETS=(x86_64-unknown-linux-gnu
     s390x-unknown-linux-gnu)
 for TARGET in "${TARGETS[@]}"; do
     # Only run the `mem` tests to avoid this taking too long.
-    cargo miri test --manifest-path testcrate/Cargo.toml --features no-asm --target $TARGET -- mem
+    cargo miri test --manifest-path builtins-test/Cargo.toml --features no-asm --target $TARGET -- mem
 done
diff --git a/ci/run.sh b/ci/run.sh
index 9abbf25a7..8dcb139d4 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -23,7 +23,7 @@ fi
 if [ "${NO_STD:-}" = "1" ]; then
     echo "nothing to do for no_std"
 else
-    run="cargo test --package testcrate --no-fail-fast --target $target"
+    run="cargo test --package builtins-test --no-fail-fast --target $target"
     $run
     $run --release
     $run --features c
@@ -37,8 +37,8 @@ else
 fi
 
 if [ "${TEST_VERBATIM:-}" = "1" ]; then
-    verb_path=$(cmd.exe //C echo \\\\?\\%cd%\\testcrate\\target2)
-    cargo build --package testcrate \
+    verb_path=$(cmd.exe //C echo \\\\?\\%cd%\\builtins-test\\target2)
+    cargo build --package builtins-test \
         --target "$target" --target-dir "$verb_path" --features c
 fi
 
diff --git a/compiler-builtins/Cargo.toml b/compiler-builtins/Cargo.toml
index eb5b2b9cc..3151546ab 100644
--- a/compiler-builtins/Cargo.toml
+++ b/compiler-builtins/Cargo.toml
@@ -68,7 +68,7 @@ mangled-names = []
 rustc-dep-of-std = ['compiler-builtins', 'core']
 
 # This makes certain traits and function specializations public that
-# are not normally public but are required by the `testcrate`
+# are not normally public but are required by the `builtins-test`
 public-test-deps = []
 
 [lints.rust]
diff --git a/compiler-builtins/configure.rs b/compiler-builtins/configure.rs
index 4be0b3ca2..d825f35a9 100644
--- a/compiler-builtins/configure.rs
+++ b/compiler-builtins/configure.rs
@@ -1,4 +1,4 @@
-// Configuration that is shared between `compiler_builtins` and `testcrate`.
+// Configuration that is shared between `compiler_builtins` and `builtins_test`.
 
 use std::env;
 
diff --git a/compiler-builtins/src/int/traits.rs b/compiler-builtins/src/int/traits.rs
index 9b079e2aa..152cb2eee 100644
--- a/compiler-builtins/src/int/traits.rs
+++ b/compiler-builtins/src/int/traits.rs
@@ -48,8 +48,8 @@ pub trait Int:
     + ops::BitAnd<Output = Self>
 {
     /// LUT used for maximizing the space covered and minimizing the computational cost of fuzzing
-    /// in `testcrate`. For example, Self = u128 produces [0,1,2,7,8,15,16,31,32,63,64,95,96,111,
-    /// 112,119,120,125,126,127].
+    /// in `builtins-test`. For example, Self = u128 produces [0,1,2,7,8,15,16,31,32,63,64,95,96,
+    /// 111,112,119,120,125,126,127].
     const FUZZ_LENGTHS: [u8; 20] = make_fuzz_lengths(<Self as MinInt>::BITS);
 
     /// The number of entries of `FUZZ_LENGTHS` actually used. The maximum is 20 for u128.