Put all coretests in a separate crate

163 files changed, 37 insertions, 17 deletions

diff --git a/library/Cargo.lock b/library/Cargo.lock
index 7b9081d46a0..30875482dc0 100644
--- a/library/Cargo.lock
+++ b/library/Cargo.lock
@@ -72,6 +72,10 @@ dependencies = [
 [[package]]
 name = "core"
 version = "0.0.0"
+
+[[package]]
+name = "coretests"
+version = "0.0.0"
 dependencies = [
  "rand",
  "rand_xorshift",
diff --git a/library/Cargo.toml b/library/Cargo.toml
index e59aa518804..1205f7c9ed6 100644
--- a/library/Cargo.toml
+++ b/library/Cargo.toml
@@ -3,6 +3,7 @@ resolver = "1"
 members = [
   "std",
   "sysroot",
+  "coretests",
 ]
 
 exclude = [
diff --git a/library/core/Cargo.toml b/library/core/Cargo.toml
index 46c55c437cc..b7c6db6c78d 100644
--- a/library/core/Cargo.toml
+++ b/library/core/Cargo.toml
@@ -15,19 +15,6 @@ edition = "2021"
 test = false
 bench = false
 
-[[test]]
-name = "coretests"
-path = "tests/lib.rs"
-
-[[bench]]
-name = "corebenches"
-path = "benches/lib.rs"
-test = true
-
-[dev-dependencies]
-rand = { version = "0.8.5", default-features = false }
-rand_xorshift = { version = "0.3.0", default-features = false }
-
 [features]
 # Make panics and failed asserts immediately abort without formatting any message
 panic_immediate_abort = []
diff --git a/library/coretests/Cargo.toml b/library/coretests/Cargo.toml
new file mode 100644
index 00000000000..ec940abea11
--- /dev/null
+++ b/library/coretests/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "coretests"
+version = "0.0.0"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/rust-lang/rust.git"
+description = "Tests for the Rust Core Library"
+autotests = false
+autobenches = false
+edition = "2021"
+
+[lib]
+path = "lib.rs"
+test = false
+bench = false
+
+[[test]]
+name = "coretests"
+path = "tests/lib.rs"
+
+[[bench]]
+name = "corebenches"
+path = "benches/lib.rs"
+test = true
+
+[dev-dependencies]
+rand = { version = "0.8.5", default-features = false }
+rand_xorshift = { version = "0.3.0", default-features = false }
diff --git a/library/core/benches/any.rs b/library/coretests/benches/any.rs
index 6b150432f87..6b150432f87 100644
--- a/library/core/benches/any.rs
+++ b/library/coretests/benches/any.rs
diff --git a/library/core/benches/array.rs b/library/coretests/benches/array.rs
index 751f3235a5f..751f3235a5f 100644
--- a/library/core/benches/array.rs
+++ b/library/coretests/benches/array.rs
diff --git a/library/core/benches/ascii.rs b/library/coretests/benches/ascii.rs
index 3fe45aa360b..3fe45aa360b 100644
--- a/library/core/benches/ascii.rs
+++ b/library/coretests/benches/ascii.rs
diff --git a/library/core/benches/ascii/is_ascii.rs b/library/coretests/benches/ascii/is_ascii.rs
index ced7084fb0e..ced7084fb0e 100644
--- a/library/core/benches/ascii/is_ascii.rs
+++ b/library/coretests/benches/ascii/is_ascii.rs
diff --git a/library/core/benches/char/methods.rs b/library/coretests/benches/char/methods.rs
index ed71920a4fc..ed71920a4fc 100644
--- a/library/core/benches/char/methods.rs
+++ b/library/coretests/benches/char/methods.rs
diff --git a/library/core/benches/char/mod.rs b/library/coretests/benches/char/mod.rs
index 9ca51a76847..9ca51a76847 100644
--- a/library/core/benches/char/mod.rs
+++ b/library/coretests/benches/char/mod.rs
diff --git a/library/core/benches/fmt.rs b/library/coretests/benches/fmt.rs
index ed478b0f1e0..ed478b0f1e0 100644
--- a/library/core/benches/fmt.rs
+++ b/library/coretests/benches/fmt.rs
diff --git a/library/core/benches/hash/mod.rs b/library/coretests/benches/hash/mod.rs
index 4f2e152b695..4f2e152b695 100644
--- a/library/core/benches/hash/mod.rs
+++ b/library/coretests/benches/hash/mod.rs
diff --git a/library/core/benches/hash/sip.rs b/library/coretests/benches/hash/sip.rs
index c6562d3c011..c6562d3c011 100644
--- a/library/core/benches/hash/sip.rs
+++ b/library/coretests/benches/hash/sip.rs
diff --git a/library/core/benches/iter.rs b/library/coretests/benches/iter.rs
index e14f26b7290..e14f26b7290 100644
--- a/library/core/benches/iter.rs
+++ b/library/coretests/benches/iter.rs
diff --git a/library/core/benches/lib.rs b/library/coretests/benches/lib.rs
index 32d15c386cb..32d15c386cb 100644
--- a/library/core/benches/lib.rs
+++ b/library/coretests/benches/lib.rs
diff --git a/library/core/benches/net/addr_parser.rs b/library/coretests/benches/net/addr_parser.rs
index bbf2ea3eb97..bbf2ea3eb97 100644
--- a/library/core/benches/net/addr_parser.rs
+++ b/library/coretests/benches/net/addr_parser.rs
diff --git a/library/core/benches/net/mod.rs b/library/coretests/benches/net/mod.rs
index c29aed46ccd..c29aed46ccd 100644
--- a/library/core/benches/net/mod.rs
+++ b/library/coretests/benches/net/mod.rs
diff --git a/library/core/benches/num/dec2flt/mod.rs b/library/coretests/benches/num/dec2flt/mod.rs
index bad211f240c..bad211f240c 100644
--- a/library/core/benches/num/dec2flt/mod.rs
+++ b/library/coretests/benches/num/dec2flt/mod.rs
diff --git a/library/core/benches/num/flt2dec/mod.rs b/library/coretests/benches/num/flt2dec/mod.rs
index 428d0bbbbfb..428d0bbbbfb 100644
--- a/library/core/benches/num/flt2dec/mod.rs
+++ b/library/coretests/benches/num/flt2dec/mod.rs
diff --git a/library/core/benches/num/flt2dec/strategy/dragon.rs b/library/coretests/benches/num/flt2dec/strategy/dragon.rs
index 45266971403..45266971403 100644
--- a/library/core/benches/num/flt2dec/strategy/dragon.rs
+++ b/library/coretests/benches/num/flt2dec/strategy/dragon.rs
diff --git a/library/core/benches/num/flt2dec/strategy/grisu.rs b/library/coretests/benches/num/flt2dec/strategy/grisu.rs
index d20f9b02f7e..d20f9b02f7e 100644
--- a/library/core/benches/num/flt2dec/strategy/grisu.rs
+++ b/library/coretests/benches/num/flt2dec/strategy/grisu.rs
diff --git a/library/core/benches/num/int_log/mod.rs b/library/coretests/benches/num/int_log/mod.rs
index e5874ddf03b..e5874ddf03b 100644
--- a/library/core/benches/num/int_log/mod.rs
+++ b/library/coretests/benches/num/int_log/mod.rs
diff --git a/library/core/benches/num/int_pow/mod.rs b/library/coretests/benches/num/int_pow/mod.rs
index 46f47028d56..46f47028d56 100644
--- a/library/core/benches/num/int_pow/mod.rs
+++ b/library/coretests/benches/num/int_pow/mod.rs
diff --git a/library/core/benches/num/int_sqrt/mod.rs b/library/coretests/benches/num/int_sqrt/mod.rs
index e47b92e866e..e47b92e866e 100644
--- a/library/core/benches/num/int_sqrt/mod.rs
+++ b/library/coretests/benches/num/int_sqrt/mod.rs
diff --git a/library/core/benches/num/mod.rs b/library/coretests/benches/num/mod.rs
index b36100e59a9..b36100e59a9 100644
--- a/library/core/benches/num/mod.rs
+++ b/library/coretests/benches/num/mod.rs
diff --git a/library/core/benches/ops.rs b/library/coretests/benches/ops.rs
index 3d0b3302957..3d0b3302957 100644
--- a/library/core/benches/ops.rs
+++ b/library/coretests/benches/ops.rs
diff --git a/library/core/benches/pattern.rs b/library/coretests/benches/pattern.rs
index b0f8b39c22e..b0f8b39c22e 100644
--- a/library/core/benches/pattern.rs
+++ b/library/coretests/benches/pattern.rs
diff --git a/library/core/benches/slice.rs b/library/coretests/benches/slice.rs
index 29a66b62199..29a66b62199 100644
--- a/library/core/benches/slice.rs
+++ b/library/coretests/benches/slice.rs
diff --git a/library/core/benches/str.rs b/library/coretests/benches/str.rs
index 2f7d9d56a70..2f7d9d56a70 100644
--- a/library/core/benches/str.rs
+++ b/library/coretests/benches/str.rs
diff --git a/library/core/benches/str/char_count.rs b/library/coretests/benches/str/char_count.rs
index 343e23dcf41..343e23dcf41 100644
--- a/library/core/benches/str/char_count.rs
+++ b/library/coretests/benches/str/char_count.rs
diff --git a/library/core/benches/str/corpora.rs b/library/coretests/benches/str/corpora.rs
index b4ac625061d..b4ac625061d 100644
--- a/library/core/benches/str/corpora.rs
+++ b/library/coretests/benches/str/corpora.rs
diff --git a/library/core/benches/str/debug.rs b/library/coretests/benches/str/debug.rs
index e41d4fa110a..e41d4fa110a 100644
--- a/library/core/benches/str/debug.rs
+++ b/library/coretests/benches/str/debug.rs
diff --git a/library/core/benches/str/iter.rs b/library/coretests/benches/str/iter.rs
index d2586cef258..d2586cef258 100644
--- a/library/core/benches/str/iter.rs
+++ b/library/coretests/benches/str/iter.rs
diff --git a/library/core/benches/tuple.rs b/library/coretests/benches/tuple.rs
index dcda7c641aa..dcda7c641aa 100644
--- a/library/core/benches/tuple.rs
+++ b/library/coretests/benches/tuple.rs
diff --git a/library/coretests/lib.rs b/library/coretests/lib.rs
new file mode 100644
index 00000000000..b49208cd4eb
--- /dev/null
+++ b/library/coretests/lib.rs
@@ -0,0 +1 @@
+// Intentionally left empty.
diff --git a/library/core/tests/alloc.rs b/library/coretests/tests/alloc.rs
index b88f1821cd7..b88f1821cd7 100644
--- a/library/core/tests/alloc.rs
+++ b/library/coretests/tests/alloc.rs
diff --git a/library/core/tests/any.rs b/library/coretests/tests/any.rs
index 25002617d0b..25002617d0b 100644
--- a/library/core/tests/any.rs
+++ b/library/coretests/tests/any.rs
diff --git a/library/core/tests/array.rs b/library/coretests/tests/array.rs
index b6d18f1ec38..b6d18f1ec38 100644
--- a/library/core/tests/array.rs
+++ b/library/coretests/tests/array.rs
diff --git a/library/core/tests/ascii.rs b/library/coretests/tests/ascii.rs
index ce09ee507f1..ce09ee507f1 100644
--- a/library/core/tests/ascii.rs
+++ b/library/coretests/tests/ascii.rs
diff --git a/library/core/tests/ascii_char.rs b/library/coretests/tests/ascii_char.rs
index 75b5fd4b9e6..75b5fd4b9e6 100644
--- a/library/core/tests/ascii_char.rs
+++ b/library/coretests/tests/ascii_char.rs
diff --git a/library/core/tests/asserting.rs b/library/coretests/tests/asserting.rs
index 1d9670886eb..1d9670886eb 100644
--- a/library/core/tests/asserting.rs
+++ b/library/coretests/tests/asserting.rs
diff --git a/library/core/tests/async_iter/mod.rs b/library/coretests/tests/async_iter/mod.rs
index 4f425d7286d..4f425d7286d 100644
--- a/library/core/tests/async_iter/mod.rs
+++ b/library/coretests/tests/async_iter/mod.rs
diff --git a/library/core/tests/atomic.rs b/library/coretests/tests/atomic.rs
index 0ffba538b20..0ffba538b20 100644
--- a/library/core/tests/atomic.rs
+++ b/library/coretests/tests/atomic.rs
diff --git a/library/core/tests/bool.rs b/library/coretests/tests/bool.rs
index 47f6459915b..47f6459915b 100644
--- a/library/core/tests/bool.rs
+++ b/library/coretests/tests/bool.rs
diff --git a/library/core/tests/bstr.rs b/library/coretests/tests/bstr.rs
index 5fecd0a4084..5fecd0a4084 100644
--- a/library/core/tests/bstr.rs
+++ b/library/coretests/tests/bstr.rs
diff --git a/library/core/tests/cell.rs b/library/coretests/tests/cell.rs
index d6a401c2b4d..d6a401c2b4d 100644
--- a/library/core/tests/cell.rs
+++ b/library/coretests/tests/cell.rs
diff --git a/library/core/tests/char.rs b/library/coretests/tests/char.rs
index 6422387e956..6422387e956 100644
--- a/library/core/tests/char.rs
+++ b/library/coretests/tests/char.rs
diff --git a/library/core/tests/clone.rs b/library/coretests/tests/clone.rs
index 054b1d3d498..054b1d3d498 100644
--- a/library/core/tests/clone.rs
+++ b/library/coretests/tests/clone.rs
diff --git a/library/core/tests/cmp.rs b/library/coretests/tests/cmp.rs
index 6c4e2146f91..6c4e2146f91 100644
--- a/library/core/tests/cmp.rs
+++ b/library/coretests/tests/cmp.rs
diff --git a/library/core/tests/const_ptr.rs b/library/coretests/tests/const_ptr.rs
index d874f08317f..d874f08317f 100644
--- a/library/core/tests/const_ptr.rs
+++ b/library/coretests/tests/const_ptr.rs
diff --git a/library/core/tests/convert.rs b/library/coretests/tests/convert.rs
index f76dd277884..f76dd277884 100644
--- a/library/core/tests/convert.rs
+++ b/library/coretests/tests/convert.rs
diff --git a/library/core/tests/error.rs b/library/coretests/tests/error.rs
index 996566d3848..996566d3848 100644
--- a/library/core/tests/error.rs
+++ b/library/coretests/tests/error.rs
diff --git a/library/core/tests/ffi.rs b/library/coretests/tests/ffi.rs
index 2b33fbd95f0..2b33fbd95f0 100644
--- a/library/core/tests/ffi.rs
+++ b/library/coretests/tests/ffi.rs
diff --git a/library/core/tests/ffi/cstr.rs b/library/coretests/tests/ffi/cstr.rs
index 9bf4c21a9ab..9bf4c21a9ab 100644
--- a/library/core/tests/ffi/cstr.rs
+++ b/library/coretests/tests/ffi/cstr.rs
diff --git a/library/core/tests/fmt/builders.rs b/library/coretests/tests/fmt/builders.rs
index ba4801f5912..ba4801f5912 100644
--- a/library/core/tests/fmt/builders.rs
+++ b/library/coretests/tests/fmt/builders.rs
diff --git a/library/core/tests/fmt/float.rs b/library/coretests/tests/fmt/float.rs
index 003782f34dc..003782f34dc 100644
--- a/library/core/tests/fmt/float.rs
+++ b/library/coretests/tests/fmt/float.rs
diff --git a/library/core/tests/fmt/mod.rs b/library/coretests/tests/fmt/mod.rs
index 025c69c4f62..025c69c4f62 100644
--- a/library/core/tests/fmt/mod.rs
+++ b/library/coretests/tests/fmt/mod.rs
diff --git a/library/core/tests/fmt/num.rs b/library/coretests/tests/fmt/num.rs
index bc387a46ea7..bc387a46ea7 100644
--- a/library/core/tests/fmt/num.rs
+++ b/library/coretests/tests/fmt/num.rs
diff --git a/library/core/tests/future.rs b/library/coretests/tests/future.rs
index ebfe5a0a66d..ebfe5a0a66d 100644
--- a/library/core/tests/future.rs
+++ b/library/coretests/tests/future.rs
diff --git a/library/core/tests/hash/mod.rs b/library/coretests/tests/hash/mod.rs
index 1f10a4733b0..1f10a4733b0 100644
--- a/library/core/tests/hash/mod.rs
+++ b/library/coretests/tests/hash/mod.rs
diff --git a/library/core/tests/hash/sip.rs b/library/coretests/tests/hash/sip.rs
index f79954f916b..f79954f916b 100644
--- a/library/core/tests/hash/sip.rs
+++ b/library/coretests/tests/hash/sip.rs
diff --git a/library/core/tests/intrinsics.rs b/library/coretests/tests/intrinsics.rs
index 744a6a0d2dd..744a6a0d2dd 100644
--- a/library/core/tests/intrinsics.rs
+++ b/library/coretests/tests/intrinsics.rs
diff --git a/library/core/tests/io/borrowed_buf.rs b/library/coretests/tests/io/borrowed_buf.rs
index a5dd4e52577..a5dd4e52577 100644
--- a/library/core/tests/io/borrowed_buf.rs
+++ b/library/coretests/tests/io/borrowed_buf.rs
diff --git a/library/core/tests/io/mod.rs b/library/coretests/tests/io/mod.rs
index a24893a525a..a24893a525a 100644
--- a/library/core/tests/io/mod.rs
+++ b/library/coretests/tests/io/mod.rs
diff --git a/library/core/tests/iter/adapters/array_chunks.rs b/library/coretests/tests/iter/adapters/array_chunks.rs
index fb19a519f63..fb19a519f63 100644
--- a/library/core/tests/iter/adapters/array_chunks.rs
+++ b/library/coretests/tests/iter/adapters/array_chunks.rs
diff --git a/library/core/tests/iter/adapters/by_ref_sized.rs b/library/coretests/tests/iter/adapters/by_ref_sized.rs
index a9c066f0e8c..a9c066f0e8c 100644
--- a/library/core/tests/iter/adapters/by_ref_sized.rs
+++ b/library/coretests/tests/iter/adapters/by_ref_sized.rs
diff --git a/library/core/tests/iter/adapters/chain.rs b/library/coretests/tests/iter/adapters/chain.rs
index 1b2c026ee1e..1b2c026ee1e 100644
--- a/library/core/tests/iter/adapters/chain.rs
+++ b/library/coretests/tests/iter/adapters/chain.rs
diff --git a/library/core/tests/iter/adapters/cloned.rs b/library/coretests/tests/iter/adapters/cloned.rs
index 78babb7feab..78babb7feab 100644
--- a/library/core/tests/iter/adapters/cloned.rs
+++ b/library/coretests/tests/iter/adapters/cloned.rs
diff --git a/library/core/tests/iter/adapters/copied.rs b/library/coretests/tests/iter/adapters/copied.rs
index b12f2035dc1..b12f2035dc1 100644
--- a/library/core/tests/iter/adapters/copied.rs
+++ b/library/coretests/tests/iter/adapters/copied.rs
diff --git a/library/core/tests/iter/adapters/cycle.rs b/library/coretests/tests/iter/adapters/cycle.rs
index 8831c09b48b..8831c09b48b 100644
--- a/library/core/tests/iter/adapters/cycle.rs
+++ b/library/coretests/tests/iter/adapters/cycle.rs
diff --git a/library/core/tests/iter/adapters/enumerate.rs b/library/coretests/tests/iter/adapters/enumerate.rs
index b57d51c077e..b57d51c077e 100644
--- a/library/core/tests/iter/adapters/enumerate.rs
+++ b/library/coretests/tests/iter/adapters/enumerate.rs
diff --git a/library/core/tests/iter/adapters/filter.rs b/library/coretests/tests/iter/adapters/filter.rs
index 167851e3333..167851e3333 100644
--- a/library/core/tests/iter/adapters/filter.rs
+++ b/library/coretests/tests/iter/adapters/filter.rs
diff --git a/library/core/tests/iter/adapters/filter_map.rs b/library/coretests/tests/iter/adapters/filter_map.rs
index 46738eda63f..46738eda63f 100644
--- a/library/core/tests/iter/adapters/filter_map.rs
+++ b/library/coretests/tests/iter/adapters/filter_map.rs
diff --git a/library/core/tests/iter/adapters/flat_map.rs b/library/coretests/tests/iter/adapters/flat_map.rs
index ee945e69801..ee945e69801 100644
--- a/library/core/tests/iter/adapters/flat_map.rs
+++ b/library/coretests/tests/iter/adapters/flat_map.rs
diff --git a/library/core/tests/iter/adapters/flatten.rs b/library/coretests/tests/iter/adapters/flatten.rs
index 66b7b6cb563..66b7b6cb563 100644
--- a/library/core/tests/iter/adapters/flatten.rs
+++ b/library/coretests/tests/iter/adapters/flatten.rs
diff --git a/library/core/tests/iter/adapters/fuse.rs b/library/coretests/tests/iter/adapters/fuse.rs
index f41b379b3ac..f41b379b3ac 100644
--- a/library/core/tests/iter/adapters/fuse.rs
+++ b/library/coretests/tests/iter/adapters/fuse.rs
diff --git a/library/core/tests/iter/adapters/inspect.rs b/library/coretests/tests/iter/adapters/inspect.rs
index 939e3a28a72..939e3a28a72 100644
--- a/library/core/tests/iter/adapters/inspect.rs
+++ b/library/coretests/tests/iter/adapters/inspect.rs
diff --git a/library/core/tests/iter/adapters/intersperse.rs b/library/coretests/tests/iter/adapters/intersperse.rs
index 72ae59b6b2f..72ae59b6b2f 100644
--- a/library/core/tests/iter/adapters/intersperse.rs
+++ b/library/coretests/tests/iter/adapters/intersperse.rs
diff --git a/library/core/tests/iter/adapters/map.rs b/library/coretests/tests/iter/adapters/map.rs
index 77ce3819b32..77ce3819b32 100644
--- a/library/core/tests/iter/adapters/map.rs
+++ b/library/coretests/tests/iter/adapters/map.rs
diff --git a/library/core/tests/iter/adapters/map_windows.rs b/library/coretests/tests/iter/adapters/map_windows.rs
index b677f1cfd55..b677f1cfd55 100644
--- a/library/core/tests/iter/adapters/map_windows.rs
+++ b/library/coretests/tests/iter/adapters/map_windows.rs
diff --git a/library/core/tests/iter/adapters/mod.rs b/library/coretests/tests/iter/adapters/mod.rs
index dedb4c0a9dd..dedb4c0a9dd 100644
--- a/library/core/tests/iter/adapters/mod.rs
+++ b/library/coretests/tests/iter/adapters/mod.rs
diff --git a/library/core/tests/iter/adapters/peekable.rs b/library/coretests/tests/iter/adapters/peekable.rs
index 7f4341b8902..7f4341b8902 100644
--- a/library/core/tests/iter/adapters/peekable.rs
+++ b/library/coretests/tests/iter/adapters/peekable.rs
diff --git a/library/core/tests/iter/adapters/scan.rs b/library/coretests/tests/iter/adapters/scan.rs
index 1d28ca6b7fd..1d28ca6b7fd 100644
--- a/library/core/tests/iter/adapters/scan.rs
+++ b/library/coretests/tests/iter/adapters/scan.rs
diff --git a/library/core/tests/iter/adapters/skip.rs b/library/coretests/tests/iter/adapters/skip.rs
index 8d5d06ad9fb..8d5d06ad9fb 100644
--- a/library/core/tests/iter/adapters/skip.rs
+++ b/library/coretests/tests/iter/adapters/skip.rs
diff --git a/library/core/tests/iter/adapters/skip_while.rs b/library/coretests/tests/iter/adapters/skip_while.rs
index 929d4f6e64f..929d4f6e64f 100644
--- a/library/core/tests/iter/adapters/skip_while.rs
+++ b/library/coretests/tests/iter/adapters/skip_while.rs
diff --git a/library/core/tests/iter/adapters/step_by.rs b/library/coretests/tests/iter/adapters/step_by.rs
index 6f3300e7a88..6f3300e7a88 100644
--- a/library/core/tests/iter/adapters/step_by.rs
+++ b/library/coretests/tests/iter/adapters/step_by.rs
diff --git a/library/core/tests/iter/adapters/take.rs b/library/coretests/tests/iter/adapters/take.rs
index b932059afec..b932059afec 100644
--- a/library/core/tests/iter/adapters/take.rs
+++ b/library/coretests/tests/iter/adapters/take.rs
diff --git a/library/core/tests/iter/adapters/take_while.rs b/library/coretests/tests/iter/adapters/take_while.rs
index 6f1ebab29b3..6f1ebab29b3 100644
--- a/library/core/tests/iter/adapters/take_while.rs
+++ b/library/coretests/tests/iter/adapters/take_while.rs
diff --git a/library/core/tests/iter/adapters/zip.rs b/library/coretests/tests/iter/adapters/zip.rs
index 70392dca0fa..70392dca0fa 100644
--- a/library/core/tests/iter/adapters/zip.rs
+++ b/library/coretests/tests/iter/adapters/zip.rs
diff --git a/library/core/tests/iter/mod.rs b/library/coretests/tests/iter/mod.rs
index 5b2769d0469..5b2769d0469 100644
--- a/library/core/tests/iter/mod.rs
+++ b/library/coretests/tests/iter/mod.rs
diff --git a/library/core/tests/iter/range.rs b/library/coretests/tests/iter/range.rs
index d5d2b8bf2b0..d5d2b8bf2b0 100644
--- a/library/core/tests/iter/range.rs
+++ b/library/coretests/tests/iter/range.rs
diff --git a/library/core/tests/iter/sources.rs b/library/coretests/tests/iter/sources.rs
index 506febaa056..506febaa056 100644
--- a/library/core/tests/iter/sources.rs
+++ b/library/coretests/tests/iter/sources.rs
diff --git a/library/core/tests/iter/traits/accum.rs b/library/coretests/tests/iter/traits/accum.rs
index f3eeb31fe58..f3eeb31fe58 100644
--- a/library/core/tests/iter/traits/accum.rs
+++ b/library/coretests/tests/iter/traits/accum.rs
diff --git a/library/core/tests/iter/traits/double_ended.rs b/library/coretests/tests/iter/traits/double_ended.rs
index 00ef4a6e6a9..00ef4a6e6a9 100644
--- a/library/core/tests/iter/traits/double_ended.rs
+++ b/library/coretests/tests/iter/traits/double_ended.rs
diff --git a/library/core/tests/iter/traits/iterator.rs b/library/coretests/tests/iter/traits/iterator.rs
index e31d2e15b6d..e31d2e15b6d 100644
--- a/library/core/tests/iter/traits/iterator.rs
+++ b/library/coretests/tests/iter/traits/iterator.rs
diff --git a/library/core/tests/iter/traits/mod.rs b/library/coretests/tests/iter/traits/mod.rs
index 80619f53f25..80619f53f25 100644
--- a/library/core/tests/iter/traits/mod.rs
+++ b/library/coretests/tests/iter/traits/mod.rs
diff --git a/library/core/tests/iter/traits/step.rs b/library/coretests/tests/iter/traits/step.rs
index bf935af397c..bf935af397c 100644
--- a/library/core/tests/iter/traits/step.rs
+++ b/library/coretests/tests/iter/traits/step.rs
diff --git a/library/core/tests/lazy.rs b/library/coretests/tests/lazy.rs
index 32d0ac51f03..32d0ac51f03 100644
--- a/library/core/tests/lazy.rs
+++ b/library/coretests/tests/lazy.rs
diff --git a/library/core/tests/lib.rs b/library/coretests/tests/lib.rs
index a8980c5f30a..a8980c5f30a 100644
--- a/library/core/tests/lib.rs
+++ b/library/coretests/tests/lib.rs
diff --git a/library/core/tests/macros.rs b/library/coretests/tests/macros.rs
index b30a40b7df2..b30a40b7df2 100644
--- a/library/core/tests/macros.rs
+++ b/library/coretests/tests/macros.rs
diff --git a/library/core/tests/macros_bootstrap.rs b/library/coretests/tests/macros_bootstrap.rs
index f10ef862c5d..f10ef862c5d 100644
--- a/library/core/tests/macros_bootstrap.rs
+++ b/library/coretests/tests/macros_bootstrap.rs
diff --git a/library/core/tests/manually_drop.rs b/library/coretests/tests/manually_drop.rs
index bbf444471ad..bbf444471ad 100644
--- a/library/core/tests/manually_drop.rs
+++ b/library/coretests/tests/manually_drop.rs
diff --git a/library/core/tests/mem.rs b/library/coretests/tests/mem.rs
index 1b5c5fc82a6..1b5c5fc82a6 100644
--- a/library/core/tests/mem.rs
+++ b/library/coretests/tests/mem.rs
diff --git a/library/core/tests/net/ip_addr.rs b/library/coretests/tests/net/ip_addr.rs
index f01b43282ec..f01b43282ec 100644
--- a/library/core/tests/net/ip_addr.rs
+++ b/library/coretests/tests/net/ip_addr.rs
diff --git a/library/core/tests/net/mod.rs b/library/coretests/tests/net/mod.rs
index 8f17bbe5548..8f17bbe5548 100644
--- a/library/core/tests/net/mod.rs
+++ b/library/coretests/tests/net/mod.rs
diff --git a/library/core/tests/net/parser.rs b/library/coretests/tests/net/parser.rs
index e03959ac77c..e03959ac77c 100644
--- a/library/core/tests/net/parser.rs
+++ b/library/coretests/tests/net/parser.rs
diff --git a/library/core/tests/net/socket_addr.rs b/library/coretests/tests/net/socket_addr.rs
index 3d013d37e04..3d013d37e04 100644
--- a/library/core/tests/net/socket_addr.rs
+++ b/library/coretests/tests/net/socket_addr.rs
diff --git a/library/core/tests/nonzero.rs b/library/coretests/tests/nonzero.rs
index 43c279053d8..43c279053d8 100644
--- a/library/core/tests/nonzero.rs
+++ b/library/coretests/tests/nonzero.rs
diff --git a/library/core/tests/num/bignum.rs b/library/coretests/tests/num/bignum.rs
index f213fd5366c..f213fd5366c 100644
--- a/library/core/tests/num/bignum.rs
+++ b/library/coretests/tests/num/bignum.rs
diff --git a/library/core/tests/num/const_from.rs b/library/coretests/tests/num/const_from.rs
index fa58e771879..fa58e771879 100644
--- a/library/core/tests/num/const_from.rs
+++ b/library/coretests/tests/num/const_from.rs
diff --git a/library/core/tests/num/dec2flt/float.rs b/library/coretests/tests/num/dec2flt/float.rs
index 7a9587a18d0..7a9587a18d0 100644
--- a/library/core/tests/num/dec2flt/float.rs
+++ b/library/coretests/tests/num/dec2flt/float.rs
diff --git a/library/core/tests/num/dec2flt/lemire.rs b/library/coretests/tests/num/dec2flt/lemire.rs
index f71bbb7c7a3..f71bbb7c7a3 100644
--- a/library/core/tests/num/dec2flt/lemire.rs
+++ b/library/coretests/tests/num/dec2flt/lemire.rs
diff --git a/library/core/tests/num/dec2flt/mod.rs b/library/coretests/tests/num/dec2flt/mod.rs
index 874e0ec7093..874e0ec7093 100644
--- a/library/core/tests/num/dec2flt/mod.rs
+++ b/library/coretests/tests/num/dec2flt/mod.rs
diff --git a/library/core/tests/num/dec2flt/parse.rs b/library/coretests/tests/num/dec2flt/parse.rs
index 4a5d24ba7d5..4a5d24ba7d5 100644
--- a/library/core/tests/num/dec2flt/parse.rs
+++ b/library/coretests/tests/num/dec2flt/parse.rs
diff --git a/library/core/tests/num/float_iter_sum_identity.rs b/library/coretests/tests/num/float_iter_sum_identity.rs
index 6d3224522a8..6d3224522a8 100644
--- a/library/core/tests/num/float_iter_sum_identity.rs
+++ b/library/coretests/tests/num/float_iter_sum_identity.rs
diff --git a/library/core/tests/num/flt2dec/estimator.rs b/library/coretests/tests/num/flt2dec/estimator.rs
index da203b5f362..da203b5f362 100644
--- a/library/core/tests/num/flt2dec/estimator.rs
+++ b/library/coretests/tests/num/flt2dec/estimator.rs
diff --git a/library/core/tests/num/flt2dec/mod.rs b/library/coretests/tests/num/flt2dec/mod.rs
index 3d825224813..3d825224813 100644
--- a/library/core/tests/num/flt2dec/mod.rs
+++ b/library/coretests/tests/num/flt2dec/mod.rs
diff --git a/library/core/tests/num/flt2dec/random.rs b/library/coretests/tests/num/flt2dec/random.rs
index 90042ae03bf..90042ae03bf 100644
--- a/library/core/tests/num/flt2dec/random.rs
+++ b/library/coretests/tests/num/flt2dec/random.rs
diff --git a/library/core/tests/num/flt2dec/strategy/dragon.rs b/library/coretests/tests/num/flt2dec/strategy/dragon.rs
index be25fee3f6c..be25fee3f6c 100644
--- a/library/core/tests/num/flt2dec/strategy/dragon.rs
+++ b/library/coretests/tests/num/flt2dec/strategy/dragon.rs
diff --git a/library/core/tests/num/flt2dec/strategy/grisu.rs b/library/coretests/tests/num/flt2dec/strategy/grisu.rs
index 9b2f0453de7..9b2f0453de7 100644
--- a/library/core/tests/num/flt2dec/strategy/grisu.rs
+++ b/library/coretests/tests/num/flt2dec/strategy/grisu.rs
diff --git a/library/core/tests/num/i128.rs b/library/coretests/tests/num/i128.rs
index 745fee05164..745fee05164 100644
--- a/library/core/tests/num/i128.rs
+++ b/library/coretests/tests/num/i128.rs
diff --git a/library/core/tests/num/i16.rs b/library/coretests/tests/num/i16.rs
index 6acb8371b87..6acb8371b87 100644
--- a/library/core/tests/num/i16.rs
+++ b/library/coretests/tests/num/i16.rs
diff --git a/library/core/tests/num/i32.rs b/library/coretests/tests/num/i32.rs
index 38d5071f71d..38d5071f71d 100644
--- a/library/core/tests/num/i32.rs
+++ b/library/coretests/tests/num/i32.rs
diff --git a/library/core/tests/num/i64.rs b/library/coretests/tests/num/i64.rs
index f8dd5f9be7f..f8dd5f9be7f 100644
--- a/library/core/tests/num/i64.rs
+++ b/library/coretests/tests/num/i64.rs
diff --git a/library/core/tests/num/i8.rs b/library/coretests/tests/num/i8.rs
index a10906618c9..a10906618c9 100644
--- a/library/core/tests/num/i8.rs
+++ b/library/coretests/tests/num/i8.rs
diff --git a/library/core/tests/num/ieee754.rs b/library/coretests/tests/num/ieee754.rs
index b0f6a7545aa..b0f6a7545aa 100644
--- a/library/core/tests/num/ieee754.rs
+++ b/library/coretests/tests/num/ieee754.rs
diff --git a/library/core/tests/num/int_log.rs b/library/coretests/tests/num/int_log.rs
index 60902752dab..60902752dab 100644
--- a/library/core/tests/num/int_log.rs
+++ b/library/coretests/tests/num/int_log.rs
diff --git a/library/core/tests/num/int_macros.rs b/library/coretests/tests/num/int_macros.rs
index f13b836378b..f13b836378b 100644
--- a/library/core/tests/num/int_macros.rs
+++ b/library/coretests/tests/num/int_macros.rs
diff --git a/library/core/tests/num/int_sqrt.rs b/library/coretests/tests/num/int_sqrt.rs
index d68db0787d2..d68db0787d2 100644
--- a/library/core/tests/num/int_sqrt.rs
+++ b/library/coretests/tests/num/int_sqrt.rs
diff --git a/library/core/tests/num/midpoint.rs b/library/coretests/tests/num/midpoint.rs
index 71e98006784..71e98006784 100644
--- a/library/core/tests/num/midpoint.rs
+++ b/library/coretests/tests/num/midpoint.rs
diff --git a/library/core/tests/num/mod.rs b/library/coretests/tests/num/mod.rs
index 0add9a01e68..0add9a01e68 100644
--- a/library/core/tests/num/mod.rs
+++ b/library/coretests/tests/num/mod.rs
diff --git a/library/core/tests/num/nan.rs b/library/coretests/tests/num/nan.rs
index ef81988c961..ef81988c961 100644
--- a/library/core/tests/num/nan.rs
+++ b/library/coretests/tests/num/nan.rs
diff --git a/library/core/tests/num/ops.rs b/library/coretests/tests/num/ops.rs
index 7b2aad48978..7b2aad48978 100644
--- a/library/core/tests/num/ops.rs
+++ b/library/coretests/tests/num/ops.rs
diff --git a/library/core/tests/num/u128.rs b/library/coretests/tests/num/u128.rs
index a7b0f9effef..a7b0f9effef 100644
--- a/library/core/tests/num/u128.rs
+++ b/library/coretests/tests/num/u128.rs
diff --git a/library/core/tests/num/u16.rs b/library/coretests/tests/num/u16.rs
index 010596a34a5..010596a34a5 100644
--- a/library/core/tests/num/u16.rs
+++ b/library/coretests/tests/num/u16.rs
diff --git a/library/core/tests/num/u32.rs b/library/coretests/tests/num/u32.rs
index 687d3bbaa90..687d3bbaa90 100644
--- a/library/core/tests/num/u32.rs
+++ b/library/coretests/tests/num/u32.rs
diff --git a/library/core/tests/num/u64.rs b/library/coretests/tests/num/u64.rs
index ee55071e949..ee55071e949 100644
--- a/library/core/tests/num/u64.rs
+++ b/library/coretests/tests/num/u64.rs
diff --git a/library/core/tests/num/u8.rs b/library/coretests/tests/num/u8.rs
index 12b038ce0f7..12b038ce0f7 100644
--- a/library/core/tests/num/u8.rs
+++ b/library/coretests/tests/num/u8.rs
diff --git a/library/core/tests/num/uint_macros.rs b/library/coretests/tests/num/uint_macros.rs
index 99a2d4cd462..99a2d4cd462 100644
--- a/library/core/tests/num/uint_macros.rs
+++ b/library/coretests/tests/num/uint_macros.rs
diff --git a/library/core/tests/num/wrapping.rs b/library/coretests/tests/num/wrapping.rs
index 0b9fca8455b..0b9fca8455b 100644
--- a/library/core/tests/num/wrapping.rs
+++ b/library/coretests/tests/num/wrapping.rs
diff --git a/library/core/tests/ops.rs b/library/coretests/tests/ops.rs
index 501e0f33fe4..501e0f33fe4 100644
--- a/library/core/tests/ops.rs
+++ b/library/coretests/tests/ops.rs
diff --git a/library/core/tests/ops/control_flow.rs b/library/coretests/tests/ops/control_flow.rs
index eacfd63a6c4..eacfd63a6c4 100644
--- a/library/core/tests/ops/control_flow.rs
+++ b/library/coretests/tests/ops/control_flow.rs
diff --git a/library/core/tests/ops/from_residual.rs b/library/coretests/tests/ops/from_residual.rs
index d5c86ccbcd3..d5c86ccbcd3 100644
--- a/library/core/tests/ops/from_residual.rs
+++ b/library/coretests/tests/ops/from_residual.rs
diff --git a/library/core/tests/option.rs b/library/coretests/tests/option.rs
index 336a79a02ce..336a79a02ce 100644
--- a/library/core/tests/option.rs
+++ b/library/coretests/tests/option.rs
diff --git a/library/core/tests/panic.rs b/library/coretests/tests/panic.rs
index 24b6c56b356..24b6c56b356 100644
--- a/library/core/tests/panic.rs
+++ b/library/coretests/tests/panic.rs
diff --git a/library/core/tests/panic/location.rs b/library/coretests/tests/panic/location.rs
index d20241d8380..d20241d8380 100644
--- a/library/core/tests/panic/location.rs
+++ b/library/coretests/tests/panic/location.rs
diff --git a/library/core/tests/pattern.rs b/library/coretests/tests/pattern.rs
index d4bec996d89..d4bec996d89 100644
--- a/library/core/tests/pattern.rs
+++ b/library/coretests/tests/pattern.rs
diff --git a/library/core/tests/pin.rs b/library/coretests/tests/pin.rs
index 026d2ca8de2..026d2ca8de2 100644
--- a/library/core/tests/pin.rs
+++ b/library/coretests/tests/pin.rs
diff --git a/library/core/tests/pin_macro.rs b/library/coretests/tests/pin_macro.rs
index 43542397a61..43542397a61 100644
--- a/library/core/tests/pin_macro.rs
+++ b/library/coretests/tests/pin_macro.rs
diff --git a/library/core/tests/ptr.rs b/library/coretests/tests/ptr.rs
index 7cefb615d03..7cefb615d03 100644
--- a/library/core/tests/ptr.rs
+++ b/library/coretests/tests/ptr.rs
diff --git a/library/core/tests/result.rs b/library/coretests/tests/result.rs
index 90ec844bc57..90ec844bc57 100644
--- a/library/core/tests/result.rs
+++ b/library/coretests/tests/result.rs
diff --git a/library/core/tests/simd.rs b/library/coretests/tests/simd.rs
index b8b5f26ca3f..b8b5f26ca3f 100644
--- a/library/core/tests/simd.rs
+++ b/library/coretests/tests/simd.rs
diff --git a/library/core/tests/slice.rs b/library/coretests/tests/slice.rs
index 510dd4967c9..510dd4967c9 100644
--- a/library/core/tests/slice.rs
+++ b/library/coretests/tests/slice.rs
diff --git a/library/core/tests/str.rs b/library/coretests/tests/str.rs
index f5066343af2..f5066343af2 100644
--- a/library/core/tests/str.rs
+++ b/library/coretests/tests/str.rs
diff --git a/library/core/tests/str_lossy.rs b/library/coretests/tests/str_lossy.rs
index 6e70ea3e285..6e70ea3e285 100644
--- a/library/core/tests/str_lossy.rs
+++ b/library/coretests/tests/str_lossy.rs
diff --git a/library/core/tests/task.rs b/library/coretests/tests/task.rs
index 163b34c9648..163b34c9648 100644
--- a/library/core/tests/task.rs
+++ b/library/coretests/tests/task.rs
diff --git a/library/core/tests/time.rs b/library/coretests/tests/time.rs
index fe7bb11c675..fe7bb11c675 100644
--- a/library/core/tests/time.rs
+++ b/library/coretests/tests/time.rs
diff --git a/library/core/tests/tuple.rs b/library/coretests/tests/tuple.rs
index ea1e281425c..ea1e281425c 100644
--- a/library/core/tests/tuple.rs
+++ b/library/coretests/tests/tuple.rs
diff --git a/library/core/tests/unicode.rs b/library/coretests/tests/unicode.rs
index bbace0ef66c..bbace0ef66c 100644
--- a/library/core/tests/unicode.rs
+++ b/library/coretests/tests/unicode.rs
diff --git a/library/core/tests/waker.rs b/library/coretests/tests/waker.rs
index 4889b8959ec..4889b8959ec 100644
--- a/library/core/tests/waker.rs
+++ b/library/coretests/tests/waker.rs
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 275c0e803cb..7e6a39a236e 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -55,14 +55,14 @@ check-aux:
 		$(BOOTSTRAP_ARGS)
 	# Run standard library tests in Miri.
 	$(Q)$(BOOTSTRAP) miri --stage 2 \
-		library/core \
+		library/coretests \
 		library/alloc \
 		$(BOOTSTRAP_ARGS) \
 		--no-doc
 	# Some doctests use file system operations to demonstrate dealing with `Result`.
 	$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
 		$(BOOTSTRAP) miri --stage 2 \
-		library/core \
+		library/coretests \
 		library/alloc \
 		$(BOOTSTRAP_ARGS) \
 		--doc
diff --git a/src/bootstrap/src/core/build_steps/check.rs b/src/bootstrap/src/core/build_steps/check.rs
index d8d862caf6a..f4a86e26396 100644
--- a/src/bootstrap/src/core/build_steps/check.rs
+++ b/src/bootstrap/src/core/build_steps/check.rs
@@ -45,7 +45,7 @@ impl Step for Std {
     const DEFAULT: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.crate_or_deps("sysroot").path("library")
+        run.crate_or_deps("sysroot").crate_or_deps("coretests").path("library")
     }
 
     fn make_run(run: RunConfig<'_>) {
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 99b033db115..5e250d18ce6 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -2658,7 +2658,7 @@ impl Step for Crate {
     const DEFAULT: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.crate_or_deps("sysroot")
+        run.crate_or_deps("sysroot").crate_or_deps("coretests")
     }
 
     fn make_run(run: RunConfig<'_>) {