diff --git a/src/tools/miri/src/shims/intrinsics/atomic.rs b/src/tools/miri/src/intrinsics/atomic.rs
similarity index 100%
rename from src/tools/miri/src/shims/intrinsics/atomic.rs
rename to src/tools/miri/src/intrinsics/atomic.rs
diff --git a/src/tools/miri/src/shims/intrinsics/mod.rs b/src/tools/miri/src/intrinsics/mod.rs
similarity index 100%
rename from src/tools/miri/src/shims/intrinsics/mod.rs
rename to src/tools/miri/src/intrinsics/mod.rs
diff --git a/src/tools/miri/src/shims/intrinsics/simd.rs b/src/tools/miri/src/intrinsics/simd.rs
similarity index 100%
rename from src/tools/miri/src/shims/intrinsics/simd.rs
rename to src/tools/miri/src/intrinsics/simd.rs
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs
index f47c84842b17..f01c2da25d9e 100644
--- a/src/tools/miri/src/lib.rs
+++ b/src/tools/miri/src/lib.rs
@@ -79,6 +79,7 @@ mod concurrency;
 mod diagnostics;
 mod eval;
 mod helpers;
+mod intrinsics;
 mod machine;
 mod mono_hash_map;
 mod operator;
@@ -95,9 +96,9 @@ pub use rustc_const_eval::interpret::*;
 #[doc(no_inline)]
 pub use rustc_const_eval::interpret::{self, AllocMap, PlaceTy, Provenance as _};
 
+pub use crate::intrinsics::EvalContextExt as _;
 pub use crate::shims::env::{EnvVars, EvalContextExt as _};
 pub use crate::shims::foreign_items::{DynSym, EvalContextExt as _};
-pub use crate::shims::intrinsics::EvalContextExt as _;
 pub use crate::shims::os_str::EvalContextExt as _;
 pub use crate::shims::panic::{CatchUnwindData, EvalContextExt as _};
 pub use crate::shims::time::EvalContextExt as _;
diff --git a/src/tools/miri/src/shims/mod.rs b/src/tools/miri/src/shims/mod.rs
index 85c9a202f7da..ab5a8c5877ec 100644
--- a/src/tools/miri/src/shims/mod.rs
+++ b/src/tools/miri/src/shims/mod.rs
@@ -5,7 +5,6 @@ mod backtrace;
 #[cfg(target_os = "linux")]
 pub mod ffi_support;
 pub mod foreign_items;
-pub mod intrinsics;
 pub mod unix;
 pub mod windows;
 mod x86;
diff --git a/src/tools/miri/tests/fail/shims/intrinsic_target_feature.rs b/src/tools/miri/tests/fail/intrinsics/intrinsic_target_feature.rs
similarity index 100%
rename from src/tools/miri/tests/fail/shims/intrinsic_target_feature.rs
rename to src/tools/miri/tests/fail/intrinsics/intrinsic_target_feature.rs
diff --git a/src/tools/miri/tests/fail/shims/intrinsic_target_feature.stderr b/src/tools/miri/tests/fail/intrinsics/intrinsic_target_feature.stderr
similarity index 100%
rename from src/tools/miri/tests/fail/shims/intrinsic_target_feature.stderr
rename to src/tools/miri/tests/fail/intrinsics/intrinsic_target_feature.stderr
diff --git a/src/tools/miri/tests/pass/intrinsics-integer.rs b/src/tools/miri/tests/pass/intrinsics/integer.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-integer.rs
rename to src/tools/miri/tests/pass/intrinsics/integer.rs
diff --git a/src/tools/miri/tests/pass/intrinsics.rs b/src/tools/miri/tests/pass/intrinsics/intrinsics.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics.rs
rename to src/tools/miri/tests/pass/intrinsics/intrinsics.rs
diff --git a/src/tools/miri/tests/pass/portable-simd-ptrs.rs b/src/tools/miri/tests/pass/intrinsics/portable-simd-ptrs.rs
similarity index 100%
rename from src/tools/miri/tests/pass/portable-simd-ptrs.rs
rename to src/tools/miri/tests/pass/intrinsics/portable-simd-ptrs.rs
diff --git a/src/tools/miri/tests/pass/portable-simd.rs b/src/tools/miri/tests/pass/intrinsics/portable-simd.rs
similarity index 100%
rename from src/tools/miri/tests/pass/portable-simd.rs
rename to src/tools/miri/tests/pass/intrinsics/portable-simd.rs
diff --git a/src/tools/miri/tests/pass/volatile.rs b/src/tools/miri/tests/pass/intrinsics/volatile.rs
similarity index 100%
rename from src/tools/miri/tests/pass/volatile.rs
rename to src/tools/miri/tests/pass/intrinsics/volatile.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86-aes-vaes.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-aes-vaes.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86-aes-vaes.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86-aes-vaes.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86-avx.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-avx.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86-avx.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86-avx.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86-avx2.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-avx2.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86-avx2.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86-avx2.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86-avx512.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-avx512.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86-avx512.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86-avx512.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86-pause-without-sse2.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-pause-without-sse2.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86-pause-without-sse2.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86-pause-without-sse2.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86-sse.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86-sse.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86-sse2.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse2.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86-sse2.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse2.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86-sse3-ssse3.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse3-ssse3.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86-sse3-ssse3.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse3-ssse3.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86-sse41.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse41.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86-sse41.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse41.rs
diff --git a/src/tools/miri/tests/pass/intrinsics-x86.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86.rs
similarity index 100%
rename from src/tools/miri/tests/pass/intrinsics-x86.rs
rename to src/tools/miri/tests/pass/shims/x86/intrinsics-x86.rs